From 779aa5f49153b5b0d5925cb4d651ab3059671104 Mon Sep 17 00:00:00 2001
From: Olga Matviienko <omatviienko@magento.com>
Date: Fri, 6 Jan 2017 16:57:50 +0200
Subject: [PATCH] MAGETWO-59112: [GITHUB] Invoice Address Formatting Issue
#6771
---
app/code/Magento/Customer/etc/config.xml | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/app/code/Magento/Customer/etc/config.xml b/app/code/Magento/Customer/etc/config.xml
index dae84471918..eb8136d605b 100644
--- a/app/code/Magento/Customer/etc/config.xml
+++ b/app/code/Magento/Customer/etc/config.xml
@@ -82,17 +82,16 @@ T: {{var telephone}}
{{depend vat_id}}<br/>VAT: {{var vat_id}}{{/depend}}]]></html>
<pdf><![CDATA[{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}|
{{depend company}}{{var company}}|{{/depend}}
-{{if street1}}{{var street1}}
-{{/if}}
+{{if street1}}{{var street1}}|{{/if}}
{{depend street2}}{{var street2}}|{{/depend}}
{{depend street3}}{{var street3}}|{{/depend}}
{{depend street4}}{{var street4}}|{{/depend}}
-{{if city}}{{var city}},|{{/if}}
+{{if city}}{{var city}}, {{/if}}
{{if region}}{{var region}}, {{/if}}{{if postcode}}{{var postcode}}{{/if}}|
{{var country}}|
-{{depend telephone}}T: {{var telephone}}{{/depend}}|
-{{depend fax}}<br/>F: {{var fax}}{{/depend}}|
-{{depend vat_id}}<br/>VAT: {{var vat_id}}{{/depend}}|]]></pdf>
+{{depend telephone}}T: {{var telephone}}|{{/depend}}
+{{depend fax}}F: {{var fax}}|{{/depend}}|
+{{depend vat_id}}VAT: {{var vat_id}}{{/depend}}|]]></pdf>
</address_templates>
</customer>
</default>
--
GitLab