diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-04-23 17:59:59 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-04-23 17:59:59 +0200 |
| commit | 3ab25b60bc5e13a91a518f5effd46a28b026a8f7 (patch) | |
| tree | 4ab971eb25736469897d13ea10e758c9caea9b01 /addons/purchase/data | |
| parent | 30490cae89a3c528c01f470e828f11853df25126 (diff) | |
| parent | cae950e826292f5246b73eeb5d85cb1d47c76978 (diff) | |
[MERGE] forward port branch saas-15 up to cae950e8262
Diffstat (limited to 'addons/purchase/data')
| -rw-r--r-- | addons/purchase/data/mail_template_data.xml | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/addons/purchase/data/mail_template_data.xml b/addons/purchase/data/mail_template_data.xml index 74ef46f2846..aa2f852a9ac 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}. <field name="auto_delete" eval="True"/> <field name="body_html"><![CDATA[<html> <head></head> + % set company = record and record.company_id or ctx.get('company') <body style="margin: 0; padding: 0;"> <table border="0" width="100%" cellpadding="0" bgcolor="#ededed" style="padding: 20px; background-color: #ededed" summary="o_mail_notification"> <tbody> @@ -101,7 +102,7 @@ from ${object.company_id.name}. </span> </td> <td valign="middle" align="right"> - <img src="/logo.png" style="padding: 0px; margin: 0px; height: auto; width: 80px;" alt="${user.company_id.name}"> + <img src="/logo.png?company=${company.id}" style="padding: 0px; margin: 0px; height: auto; width: 80px;" alt="${company.name}"> </td> </tr> </table> @@ -127,16 +128,16 @@ from ${object.company_id.name}. <table width="590" border="0" cellpadding="0" bgcolor="#875A7B" style="min-width: 590px; background-color: rgb(135,90,123); padding: 20px;"> <tr> <td valign="middle" align="left" style="color: #fff; padding-top: 10px; padding-bottom: 10px; font-size: 12px;"> - ${user.company_id.name}<br/> - ${user.company_id.phone or ''} + ${company.name}<br/> + ${company.phone or ''} </td> <td valign="middle" align="right" style="color: #fff; padding-top: 10px; padding-bottom: 10px; font-size: 12px;"> - % if user.company_id.email: - <a href="mailto:${user.company_id.email}" style="text-decoration:none; color: white;">${user.company_id.email}</a><br/> + % if company.email: + <a href="mailto:${company.email}" style="text-decoration:none; color: white;">${company.email}</a><br/> % endif - % if user.company_id.website: - <a href="${user.company_id.website}" style="text-decoration:none; color: white;"> - ${user.company_id.website} + % if company.website: + <a href="${company.website}" style="text-decoration:none; color: white;"> + ${company.website} </a> % endif </td> |