merge changes from pickup_date_on_delivery_order from stock-logistics-reporting