diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-10-20 17:24:15 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-10-20 17:24:15 +0200 |
| commit | bee0c11ef7fdd2f289b1b5d33bf4574e519d8fcf (patch) | |
| tree | f763f9a855c0ab0b02f944c88ff6713bbbe3f34f /addons/mail | |
| parent | 8096162beeed30debcb1c3945e7f9cee35710666 (diff) | |
| parent | f3ac68ed29a478b8f092a3bc8523df171312a636 (diff) | |
[MERGE] forward port branch saas-14 up to f3ac68ed29a
Diffstat (limited to 'addons/mail')
| -rw-r--r-- | addons/mail/data/mail_data.xml | 3 | ||||
| -rw-r--r-- | addons/mail/models/res_partner.py | 7 | ||||
| -rw-r--r-- | addons/mail/wizard/email_template_preview_view.xml | 3 |
3 files changed, 11 insertions, 2 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> diff --git a/addons/mail/models/res_partner.py b/addons/mail/models/res_partner.py index 2ef3f6508b6..85b9dbb74e8 100644 --- a/addons/mail/models/res_partner.py +++ b/addons/mail/models/res_partner.py @@ -53,7 +53,6 @@ class Partner(models.Model): website_url = 'http://%s' % user.company_id.website if not user.company_id.website.lower().startswith(('http:', 'https:')) else user.company_id.website else: website_url = False - company_name = user.company_id.name model_name = False if message.model: @@ -73,9 +72,15 @@ class Partner(models.Model): if message.res_id and message.model in self.env: record = self.env[message.model].browse(message.res_id) + company = user.company_id; + if record and hasattr(record, 'company_id'): + company = record.company_id; + company_name = company.name; + return { 'signature': signature, 'website_url': website_url, + 'company': company, 'company_name': company_name, 'model_name': model_name, 'record': record, diff --git a/addons/mail/wizard/email_template_preview_view.xml b/addons/mail/wizard/email_template_preview_view.xml index 7d5cd1cb6d6..67068f5dc84 100644 --- a/addons/mail/wizard/email_template_preview_view.xml +++ b/addons/mail/wizard/email_template_preview_view.xml @@ -28,6 +28,9 @@ <field name="body_html" widget="html" readonly="1" nolabel="1" options='{"safe": True}'/> <field name="attachment_ids" widget="many2many_binary" readonly="1"/> + <footer> + <button string="Discard" class="btn-default" special="cancel"/> + </footer> </form> </field> </record> |