IntraStat Delivery Terms and Country of Origin options on S/O P/O

The current system automatically assigns one to all, then you need to manually change each one afterwards. It may work better to have the ability to chose Delivery Terms (i.e. EXW, DDP) on Sales Orders and Purchase Orders as you can have one supplier who will offer multiple shipment options. Also, some suppliers may have one head office but may export product from multiple countries. It may be useful to have the ability to add Origin Country codes on Sales Orders and Purchase Orders.