diff --git a/addons/account/data/email_template_data_invoice.xml b/addons/account/data/email_template_data_invoice.xml index b012e8cbbf1..7701b1ce222 100644 --- a/addons/account/data/email_template_data_invoice.xml +++ b/addons/account/data/email_template_data_invoice.xml @@ -70,7 +70,7 @@ from ${object.company_id.name}. % set record = ctx.get('record') - % set company = record and record.company_id or user.company_id + % set company = record and record.company_id or ctx.get('company') diff --git a/addons/purchase/data/mail_template_data.xml b/addons/purchase/data/mail_template_data.xml index 35445697973..626da70daa9 100644 --- a/addons/purchase/data/mail_template_data.xml +++ b/addons/purchase/data/mail_template_data.xml @@ -86,6 +86,7 @@ from ${object.company_id.name}. + % set company = record and record.company_id or ctx.get('company')
@@ -101,7 +102,7 @@ from ${object.company_id.name}.
- ${user.company_id.name} + ${company.name}
@@ -127,16 +128,16 @@ from ${object.company_id.name}. diff --git a/addons/sale/data/mail_template_data.xml b/addons/sale/data/mail_template_data.xml index acae4ff8cc1..79e796b2c73 100644 --- a/addons/sale/data/mail_template_data.xml +++ b/addons/sale/data/mail_template_data.xml @@ -69,7 +69,7 @@ from ${object.company_id.name}. % set record = ctx.get('record') - % set company = record and record.company_id or user.company_id + % set company = record and record.company_id or ctx.get('company')
- ${user.company_id.name}
- ${user.company_id.phone or ''} + ${company.name}
+ ${company.phone or ''}
- % if user.company_id.email: - ${user.company_id.email}
+ % if company.email: + ${company.email}
% endif - % if user.company_id.website: - - ${user.company_id.website} + % if company.website: + + ${company.website} % endif