Format Address Input

[snjdrew]

I have searched the forum for this issue and seen it fix in previous versions but not really on the new 1.4 system. I assume that using the address format within the countries section of the BO will show the address correct on invoices and such but I am also interested in making it so that you input the same order.

The address layout for US in BO is showing:

company
firstname lastname
address1
address2
city State:name postcode
Country:name
phone

But when checking out input is as follows:

Company
First name
Last name
Address
Address (Line 2)
City
Zip / Postal code
Country
State

The key to this is that the state should be between city and postcode. I have looked at the code in some of the tpl files and think I can probably work in there to fix this issue but I figured I would ask first. Thanks for any help!