diff options
| author | Yannick Tivisse <yti@odoo.com> | 2015-09-29 17:30:14 +0200 |
|---|---|---|
| committer | Yannick Tivisse <yti@odoo.com> | 2015-09-30 16:45:22 +0200 |
| commit | 757ababa68d85fcc417e746292dfe68e2f67aa96 (patch) | |
| tree | 4c891aa837d90ec2175e370f170b476d917f7f5d /addons/purchase/data/mail_template_data.xml | |
| parent | 411c806887476c4041cf7e8dbc1e8aff5c65c9a3 (diff) | |
[FIX] account,sale,purchase: Take country format address in email templates
In qweb reports, the address is displayed according the standards of the
country where it belongs. In the email templates, the company address was
always displayed in the same way, no matter the country of the address.
Diffstat (limited to 'addons/purchase/data/mail_template_data.xml')
| -rw-r--r-- | addons/purchase/data/mail_template_data.xml | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/addons/purchase/data/mail_template_data.xml b/addons/purchase/data/mail_template_data.xml index 0e28b846909..1a743871538 100644 --- a/addons/purchase/data/mail_template_data.xml +++ b/addons/purchase/data/mail_template_data.xml @@ -46,18 +46,7 @@ </div> <div style="width: 347px; margin: 0px; padding: 5px 14px; line-height: 16px; background-color: #F2F2F2;"> <span style="color: #222; margin-bottom: 5px; display: block; "> - % if object.company_id.street: - ${object.company_id.street}<br/> - % endif - % if object.company_id.street2: - ${object.company_id.street2}<br/> - % endif - % if object.company_id.city or object.company_id.zip: - ${object.company_id.zip} ${object.company_id.city}<br/> - % endif - % if object.company_id.country_id: - ${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}<br/> - % endif + ${object.company_id.partner_id.sudo().with_context(show_address=True, html_format=True).name_get()[0][1] | safe} </span> % if object.company_id.phone: <div style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; "> @@ -121,18 +110,7 @@ </div> <div style="width: 347px; margin: 0px; padding: 5px 14px; line-height: 16px; background-color: #F2F2F2;"> <span style="color: #222; margin-bottom: 5px; display: block; "> - % if object.company_id.street: - ${object.company_id.street}<br/> - % endif - % if object.company_id.street2: - ${object.company_id.street2}<br/> - % endif - % if object.company_id.city or object.company_id.zip: - ${object.company_id.zip} ${object.company_id.city}<br/> - % endif - % if object.company_id.country_id: - ${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}<br/> - % endif + ${object.company_id.partner_id.sudo().with_context(show_address=True, html_format=True).name_get()[0][1] | safe} </span> % if object.company_id.phone: <div style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; "> |