diff options
| author | Julien (juc) Castiaux <juc@odoo.com> | 2018-11-05 15:33:34 +0000 |
|---|---|---|
| committer | Julien (juc) Castiaux <juc@odoo.com> | 2018-11-06 15:11:07 +0000 |
| commit | de6a8cefd0bb7acf7af3daba1d3c76da4cedfd76 (patch) | |
| tree | 2f5890e7cd8587afd087cba2ac60a7923764a116 | |
| parent | cfca2bb0ffa8a16aeafa3c4114c7f731ee0c87d9 (diff) | |
[FIX] mail: no company printed in footer
In a multiple company account, when a parter is doesn't have a
company, the mails he revieved have "Send by using odoo" as footer.
This PR correct that by setting the footer to "Send using odoo" when
there is no company.
opw-1894825
| -rw-r--r-- | addons/mail/data/mail_data.xml | 5 | ||||
| -rw-r--r-- | addons/mail/i18n/mail.pot | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml index dd1b88e21e0..ed26830a36a 100644 --- a/addons/mail/data/mail_data.xml +++ b/addons/mail/data/mail_data.xml @@ -88,11 +88,14 @@ </ul> <div t-if="signature" t-raw="signature" class="font-size: 13px;"/> <p style="color: #555555; margin-top:32px;"> - Sent by + Sent + <span t-if="company.name"> + by <a t-if="website_url" t-att-href="website_url" style="text-decoration:none; color: #875A7B;"> <span t-esc="company.name"/> </a> <span t-if="not website_url" t-esc="company.name"/> + </span> using <a target="_blank" href="https://www.odoo.com?utm_source=db&utm_medium=email" style="text-decoration:none; color: #875A7B;">Odoo</a>. </p> diff --git a/addons/mail/i18n/mail.pot b/addons/mail/i18n/mail.pot index beb83dc09eb..80b1399e139 100644 --- a/addons/mail/i18n/mail.pot +++ b/addons/mail/i18n/mail.pot @@ -4533,7 +4533,8 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:397 +#: code:addons/mail/static/src/xml/thread.xml:390 +#: model_terms:ir.ui.view,arch_db:mail.message_notification_email #: model_terms:ir.ui.view,arch_db:mail.view_mail_search #: selection:mail.mail,state:0 #: selection:mail.notification,email_status:0 @@ -5566,6 +5567,7 @@ msgstr "" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/activity.xml:43 +#: model_terms:ir.ui.view,arch_db:mail.message_notification_email #: model_terms:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "by" |