Option to adjust how a business address is displayed

Option to adjust how a business address is displayed

Would it be possible to add an option to re-arrange the way the address fields are displayed on invoices?

The way it currently displays is:

Acme Company Corp
1234 Street Lane
City
123456 State

In Canada, we display as follow:

Acme Company Corp
1234 Street Lane
City, State
123456

I've had a few comments from my customers that I should change this, but without manually changing a PDF file I can't.