Merge pull request #25359 from 18alantom/fix_shipment_pickup_to

fix: shipment pickup_to, pickup_from functionality.