pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] event, mail: company in mail footer

Browse Source 
closes odoo/odoo#28416
This commit is contained in:
Robot Odoo
2018-11-12 14:59:24 +01:00
committed by GitHub
parent 70a55a33c6 de6a8cefd0
commit 5e987bc020
4 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/event/data/email_template_data.xml
+4
View File
@@ -205,6 +205,7 @@
</table>
</td></tr>
<!-- FOOTER BY -->
% if object.company_id
<tr><td align="center" style="min-width: 590px;">
<table width="590" border="0" cellpadding="0" cellspacing="0" style="min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;">
<tr><td style="text-align: center; font-size: 14px;">
@@ -216,6 +217,7 @@
</td></tr>
</table>
</td></tr>
% endif
</table>
</field>
<field name="lang">${object.partner_id.lang}</field>
@@ -399,6 +401,7 @@
</table>
</td></tr>
<!-- FOOTER BY -->
% if object.company_id
<tr><td align="center" style="min-width: 590px;">
<table width="590" border="0" cellpadding="0" cellspacing="0" style="min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;">
<tr><td style="text-align: center; font-size: 14px;">
@@ -410,6 +413,7 @@
</td></tr>
</table>
</td></tr>
% endif
</table>
</field>
<field name="lang">${object.partner_id.lang}</field>
addons/event/i18n/event.pot
+4
View File
@@ -316,11 +316,13 @@ msgid "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-t
"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
" <table width=\"590\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
" <tr><td style=\"text-align: center; font-size: 14px;\">\n"
" % if object.company_id\n"
" Sent by <a target=\"_blank\" href=\"${object.company_id.website}\" style=\"color: #875A7B;\">${object.company_id.name}</a>\n"
" % if 'website_url' in object.event_id and object.event_id.website_url:\n"
" <br/>\n"
" Discover <a href=\"/event\" style=\"text-decoration:none;color:#717188;\">all our events</a>.\n"
" % endif\n"
" % endif\n"
" </td></tr>\n"
" </table>\n"
"</td></tr>\n"
@@ -502,11 +504,13 @@ msgid "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-t
"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
" <table width=\"590\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
" <tr><td style=\"text-align: center; font-size: 14px;\">\n"
" % if object.company_id:\n"
" Sent by <a target=\"_blank\" href=\"${object.company_id.website}\" style=\"color: #875A7B;\">${object.company_id.name}</a>\n"
" % if 'website_url' in object.event_id and object.event_id.website_url:\n"
" <br/>\n"
" Discover <a href=\"/event\" style=\"text-decoration:none;color:#717188;\">all our events</a>.\n"
" % endif\n"
" % endif\n"
" </td></tr>\n"
" </table>\n"
"</td></tr>\n"
addons/mail/data/mail_data.xml
+4 -1
View File
@@ -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&amp;utm_medium=email" style="text-decoration:none; color: #875A7B;">Odoo</a>.
</p>
addons/mail/i18n/mail.pot
+3 -1
View File
@@ -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"