summaryrefslogtreecommitdiff
path: root/addons/mail/data
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2017-10-20 17:24:15 +0200
committerChristophe Simonis <chs@odoo.com>2017-10-20 17:24:15 +0200
commitbee0c11ef7fdd2f289b1b5d33bf4574e519d8fcf (patch)
treef763f9a855c0ab0b02f944c88ff6713bbbe3f34f /addons/mail/data
parent8096162beeed30debcb1c3945e7f9cee35710666 (diff)
parentf3ac68ed29a478b8f092a3bc8523df171312a636 (diff)
[MERGE] forward port branch saas-14 up to f3ac68ed29a
Diffstat (limited to 'addons/mail/data')
-rw-r--r--addons/mail/data/mail_data.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml
index 36c26f56eb4..34789916a48 100644
--- a/addons/mail/data/mail_data.xml
+++ b/addons/mail/data/mail_data.xml
@@ -71,6 +71,7 @@
<field name="model_id" ref="mail.model_mail_message"/>
<field name="auto_delete" eval="True"/>
<field name="body_html"><![CDATA[
+% set company = ctx.get('company', user.company_id)
<div>
% if ctx.get('has_button_access'):
<div itemscope itemtype="http://schema.org/EmailMessage">
@@ -110,7 +111,7 @@
% endif
</td>
<td valign="center" align="right">
- <img src="/logo.png" style="padding: 0px; margin: 0px; height: auto; max-width: 80px; max-height: 40px;" alt="${user.company_id.name}">
+ <img src="/logo.png?company=${company.id}" style="padding: 0px; margin: 0px; height: auto; max-width: 80px; max-height: 40px;" alt="${company.name}">
</td>
</tr>
<tr>