This reverts commit 15aaafbf.
Reason: To be consistent with packing list and order until
the new way of handling payment conditions is implemented.