diff options
| author | Julien (juc) Castiaux <juc@odoo.com> | 2018-11-05 15:29:48 +0000 |
|---|---|---|
| committer | Julien (juc) Castiaux <juc@odoo.com> | 2018-11-05 15:29:48 +0000 |
| commit | cfca2bb0ffa8a16aeafa3c4114c7f731ee0c87d9 (patch) | |
| tree | 6efcf3ce47fbbb095f02a7070f6d93aae4ed9e91 /addons | |
| parent | 70a55a33c6a25f1d68c3faffb6a9616e78115e21 (diff) | |
[FIX] event: wrong email footer
In a multiple company account, when creating an event without
company, the emails sent contain "Send by False" as footer, this
PR correct that by disabling the footer in case there is no company
opw-1894825
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/event/data/email_template_data.xml | 4 | ||||
| -rw-r--r-- | addons/event/i18n/event.pot | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/addons/event/data/email_template_data.xml b/addons/event/data/email_template_data.xml index c1ca30a1347..023cb9d44bc 100644 --- a/addons/event/data/email_template_data.xml +++ b/addons/event/data/email_template_data.xml @@ -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> diff --git a/addons/event/i18n/event.pot b/addons/event/i18n/event.pot index 9af3e6e90ed..36d5324019a 100644 --- a/addons/event/i18n/event.pot +++ b/addons/event/i18n/event.pot @@ -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" |