From cfca2bb0ffa8a16aeafa3c4114c7f731ee0c87d9 Mon Sep 17 00:00:00 2001
From: "Julien (juc) Castiaux" <juc@odoo.com>
Date: Mon, 5 Nov 2018 15:29:48 +0000
Subject: [PATCH] [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
---
 addons/event/data/email_template_data.xml | 4 ++++
 addons/event/i18n/event.pot               | 4 ++++
 2 files changed, 8 insertions(+)

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"