I am having the same problem with the new layout. The invoices should reflect the settings in the locations list. Please address these issues with the new template/layout. It's still a problem.
