Improving PO to accurate the delivery dates.

We are agreed with suppliers on different Delivery Terms (in E1 called Freight Handling Code) that state the date when the supplier is expected to have the goods at a specific location. This location can be, depending on term, our, as well as their dock.  At the moment we have a focus only on when goods should be at our dock. It would make sense on a PO print-out state, when the supplier is expected to have the goods at their dock, if the delivery terms state their responsibility to end at their dock.

For example:

When the buyer is responsible, (EXW/FCA/FOB etc) then the date of arrival(rather requested date of shipping) would show the date, when the goods have to be ready at suppliers dock. When supplier is responsible, (DDP/DAP/(DDU)etc), the date of arrival would show the date when the goods have to be at out dock.