Since upgrading to OE 8.1C (090902) and AR 9.0A (090928) our customer's address on invoices from OE are printing a little differently. OE Invoice specification billing info is as follows:

C2 Customer Name
B8 Bill to Address 1
B9 Bill to Address 2
B10 Bill to Address 3
B12 Postal Code
B11 Bill to Address 4

When a customer has info in both Address 1 & 2 it prints as follows:

John Smith
123 Anystreet
RR#1
Anywhere, ON
K0H 1M0
Canada

When there is no info in Address 2 it prints as follows:

John Smith
123 Anystreet
Anywhere, ON
Canada

K0H 1M0

1. How do I eliminate the country from printing?

2. How can I pull the postal code up so it always prints on the line folling the City, Province?