Specify parcel QTY by sales channel.

I refer to Case reference number: 07662327

I have created commercial invoices but the following is happening:

1. If I add "Additional Order Documents" - I can specify a country however when an order is created, ALL of the additional order documents are added to the order and not just the one for the country specified. ie: Documents are specified by Country but ALL are added to an order rather than the country specific document.

2. If I add a "Document Template" and use a rule to insert this into an order for a specific country - the merge fields are not working and reflect as '#WAYBILLNUMBER#' or '«HS_CODE»'. ie: Tags do not work.

We are required to specify our VAT number and Importer of record details for customs for each country we send items to, which I imagine will become a prevalent issue for most users.