[FIX][IMP] various: perform small cleanup of mail templates

Notably
 * remove cdata and fix html code when necessary;
 * re-order fields declaration to have globally the same order in various
   template definition;
 * remove unnecessary reply-to, make user signature and auto delete fields
   explicit when necessary;
 * improve some name to ease template ordering and understanding in the
   template list view;

Related to task 1972615
Linked to PR #32872

Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>

13 files changed, 76 insertions, 74 deletions

diff --git a/addons/crm_iap_lead/data/crm_iap_lead_data.xml b/addons/crm_iap_lead/data/crm_iap_lead_data.xml
index 1b814c0a283..86353c73d32 100644
--- a/addons/crm_iap_lead/data/crm_iap_lead_data.xml
+++ b/addons/crm_iap_lead/data/crm_iap_lead_data.xml
@@ -7,16 +7,14 @@
             <field name="email_to">iap@odoo.com</field>
             <field name="subject">IAP Lead Generation Notification</field>
             <field name="model_id" ref="iap.model_iap_account"/>
-            <field name="body_html">
-                <![CDATA[
-                    <p>Dear,</p>
-                    <p>There is no more credits on your IAP Lead Generation account.<br/>
-                    You can charge your IAP Lead Generation account in the settings of the CRM app.<br/>
-
-                    <p>Best regards,</p>
-                    <p>Odoo S.A.</p>
-                ]]>
-            </field>
+            <field name="body_html" type="html">
+<div style="margin: 0px; padding: 0px;">
+    <p>Dear,</p>
+    <p>There is no more credits on your IAP Lead Generation account.<br/>
+    You can charge your IAP Lead Generation account in the settings of the CRM app.<br/></p>
+    <p>Best regards,</p>
+    <p>Odoo S.A.</p>
+</div></field>
         </record>
     </data>
 </odoo>
diff --git a/addons/digest/data/digest_template_data.xml b/addons/digest/data/digest_template_data.xml
index aebf9ac0242..c333e76455c 100644
--- a/addons/digest/data/digest_template_data.xml
+++ b/addons/digest/data/digest_template_data.xml
@@ -3,10 +3,9 @@
     <record id="digest_mail_template" model="mail.template">
         <field name="name">Digest: Default main template</field>
         <field name="model_id" ref="digest.model_digest_digest"/>
-        <field name="auto_delete" eval="True" />
         <field name="email_from">${user.email_formatted | safe}</field>
-        <field name="lang">${user.lang}</field>
-        <field name="body_html"><![CDATA[
+        <field name="subject">${'%s: %s' % (ctx.get('user', user).company_id.name, object.name)}</field>
+        <field name="body_html" type="html">
 <table style="width: 100%; border-spacing: 0; font-family: Helvetica,Arial,Verdana,sans-serif;">
     <tr>
         <td align="center" valign="top" style="border-collapse: collapse; padding: 0">
@@ -54,10 +53,10 @@
                                                     <span style="color: #888888; display: inline-block; font-size: 12px; line-height: 18px; text-transform: uppercase;">Yesterday</span>
                                                     % if data['yesterday'][kpi]['margin'] != 0.0:
                                                         <span style="color: #888888; display: block; font-size: 12px; line-height: 18px; text-transform: uppercase;">
-                                                            % if data['yesterday'][kpi]['margin'] > 0.0:
+                                                            % if data['yesterday'][kpi]['margin'] &gt; 0.0:
                                                                 <span style="color: #0bbc22;">▲</span>${"%.2f" % data['yesterday'][kpi]['margin']} %
                                                             % endif
-                                                            % if data['yesterday'][kpi]['margin'] < 0.0:
+                                                            % if data['yesterday'][kpi]['margin'] &lt; 0.0:
                                                                 <span style="color: #ff0000;">▼</span>${"%.2f" % data['yesterday'][kpi]['margin']} %
                                                             % endif
                                                         </span>
@@ -74,10 +73,10 @@
                                                     <span style="color: #888888; display: inline-block; font-size: 12px; line-height: 18px; text-transform: uppercase;">Last 7 Days</span>
                                                     % if data['lastweek'][kpi]['margin'] != 0.0:
                                                         <span style="color: #888888; display: block; font-size: 12px; line-height: 18px; text-transform: uppercase;">
-                                                            % if data['lastweek'][kpi]['margin'] > 0.0:
+                                                            % if data['lastweek'][kpi]['margin'] &gt; 0.0:
                                                                 <span style="color: #0bbc22;">▲</span>${"%.2f" % data['lastweek'][kpi]['margin']} %
                                                             % endif
-                                                            % if data['lastweek'][kpi]['margin'] < 0.0:
+                                                            % if data['lastweek'][kpi]['margin'] &lt;0.0:
                                                                 <span style="color: #ff0000;">▼</span>${"%.2f" % data['lastweek'][kpi]['margin']} %
                                                             %endif
                                                         </span>
@@ -94,10 +93,10 @@
                                                     <span style="color: #888888; display: inline-block; font-size: 12px; line-height: 18px; text-transform: uppercase;">Last 30 Days</span>
                                                     % if data['lastmonth'][kpi]['margin'] != 0.0:
                                                         <span style="color: #888888; display: block; font-size: 12px; line-height: 18px; text-transform: uppercase;">
-                                                             % if data['lastmonth'][kpi]['margin'] > 0.0:
+                                                             % if data['lastmonth'][kpi]['margin'] &gt; 0.0:
                                                                 <span style="color: #0bbc22;">▲</span>${"%.2f" % data['lastmonth'][kpi]['margin']} %
                                                             % endif
-                                                            % if data['lastmonth'][kpi]['margin'] < 0.0:
+                                                            % if data['lastmonth'][kpi]['margin'] &lt; 0.0:
                                                                 <span style="color: #ff0000;">▼</span>${"%.2f" % data['lastmonth'][kpi]['margin']} %
                                                             %endif
                                                         </span>
@@ -155,7 +154,9 @@
             </table>
         </td>
     </tr>
-</table>
-        ]]></field>
+</table></field>
+        <field name="lang">${user.lang}</field>
+        <field name="auto_delete" eval="True"/>
+        <field name="user_signature" eval="False"/>
     </record>
 </odoo>
diff --git a/addons/event/data/email_template_data.xml b/addons/event/data/email_template_data.xml
index 004242a54e7..4aec1ff6a13 100644
--- a/addons/event/data/email_template_data.xml
+++ b/addons/event/data/email_template_data.xml
@@ -24,6 +24,7 @@
             <field name="report_name">badge_of_${(object.event_id.name or '').replace('/','_')}</field>
             <field name="lang">${object.partner_id.lang}</field>
             <field name="auto_delete" eval="True"/>
+            <field name="user_signature" eval="False"/>
         </record>
 
         <record id="event_subscription" model="mail.template">
@@ -32,7 +33,6 @@
             <field name="subject">Your registration at ${object.event_id.name}</field>
             <field name="email_from">${(object.event_id.organizer_id.email_formatted or object.event_id.user_id.email_formatted or '') | safe}</field>
             <field name="email_to">${(object.partner_id.email_formatted or '"%s" &lt;%s&gt;' % (object.name, object.email) or '') | safe}</field>
-            <field name="reply_to" eval="False"/>
             <field name="body_html" type="html">
 <table border="0" cellpadding="0" cellspacing="0" style="padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;"><tr><td align="center">
 % set date_begin = format_tz(object.event_id.date_begin, tz='UTC', format='%Y%m%dT%H%M%SZ')
@@ -221,6 +221,7 @@
 </table>
             </field>
             <field name="lang">${object.partner_id.lang}</field>
+            <field name="user_signature" eval="False"/>
         </record>
 
         <record id="event_reminder" model="mail.template">
@@ -229,7 +230,6 @@
             <field name="subject">${object.event_id.name}: ${object.get_date_range_str()}</field>
             <field name="email_from">${(object.event_id.organizer_id.email_formatted or object.event_id.user_id.email_formatted or '') | safe}</field>
             <field name="email_to">${(object.partner_id.email_formatted or '"%s" &lt;%s&gt;' % (object.name, object.email) or '') | safe}</field>
-            <field name="reply_to" eval="False"/>
             <field name="body_html" type="html">
 <table border="0" cellpadding="0" cellspacing="0" style="padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;"><tr><td align="center">
 % set date_begin = format_tz(object.event_id.date_begin, tz='UTC', format='%Y%m%dT%H%M%SZ')
@@ -418,6 +418,7 @@
 </table>
             </field>
             <field name="lang">${object.partner_id.lang}</field>
+            <field name="user_signature" eval="False"/>
         </record>
 
     </data>
diff --git a/addons/gamification/data/badge.xml b/addons/gamification/data/badge.xml
index 50f7e765a02..06476e98066 100644
--- a/addons/gamification/data/badge.xml
+++ b/addons/gamification/data/badge.xml
@@ -37,7 +37,6 @@
             <field name="subject">New badge ${object.badge_id.name} granted</field>
             <field name="model_id" ref="gamification.model_gamification_badge_user"/>
             <field name="partner_to">${object.user_id.partner_id.id}</field>
-            <field name="lang">${object.user_id.lang}</field>
             <field name="body_html" type="xml">
 <table border="0" cellpadding="0" style="padding-top: 16px; background-color: #F1F1F1; color: #454748; width: 100%; border-collapse:separate;"><tr><td align="center">
 <table border="0" width="590" cellpadding="0" style="padding: 16px; background-color: white; color: #454748; border-collapse:separate;" summary="o_mail_notification">
@@ -134,10 +133,10 @@
       </td></tr>
     </table>
 </td></tr>
-</table>
-
-
-</field>
+</table></field>
+            <field name="lang">${object.user_id.lang}</field>
+            <field name="user_signature" eval="False"/>
+            <field name="auto_delete" eval="True"/>
         </record>
     </data>
 </odoo>
diff --git a/addons/gamification/data/goal_base.xml b/addons/gamification/data/goal_base.xml
index ca1061b6d24..cc61a34bad1 100644
--- a/addons/gamification/data/goal_base.xml
+++ b/addons/gamification/data/goal_base.xml
@@ -7,7 +7,6 @@
         <record id="email_template_goal_reminder" model="mail.template">
             <field name="name">Goal: Reminder for Goal Update</field>
             <field name="model_id" ref="gamification.model_gamification_goal"/>
-            <field name="lang">${object.user_id.lang}</field>
             <field name="partner_to">${object.user_id.partner_id.id}</field>
             <field name="body_html" type="html">
 <div>
@@ -20,10 +19,13 @@ Thank you,
     ${object.challenge_id.manager_id.signature | safe}
     % endif
 </div></field>
+            <field name="lang">${object.user_id.lang}</field>
+            <field name="user_signature" eval="False"/>
+            <field name="auto_delete" eval="True"/>
         </record>
         
         <record id="simple_report_template" model="mail.template">
-            <field name="name">Simple Challenge Report Progress</field>
+            <field name="name">Challenge: Simple Challenge Report Progress</field>
             <field name="model_id" ref="gamification.model_gamification_challenge"/>
             <field name="body_html" type="html">
 <table cellspacing="0" cellpadding="0" width="100%" style="background-color: #EEE; border-collapse: collapse;">
diff --git a/addons/gamification/models/goal.py b/addons/gamification/models/goal.py
index e182769a2e3..dfb850897c8 100644
--- a/addons/gamification/models/goal.py
+++ b/addons/gamification/models/goal.py
@@ -221,6 +221,7 @@ class Goal(models.Model):
                            .get_email_template(self.id)
         body_html = self.env['mail.template'].with_context(template._context)\
             ._render_template(template.body_html, 'gamification.goal', self.id)
+        # TDE NOTE: should be a notification (see with xdo)
         self.env['mail.thread'].message_post(
             body=body_html,
             partner_ids=[self.user_id.partner_id.id],
diff --git a/addons/gamification/views/mail_templates.xml b/addons/gamification/views/mail_templates.xml
index cf840157222..fda8a66f9a4 100644
--- a/addons/gamification/views/mail_templates.xml
+++ b/addons/gamification/views/mail_templates.xml
@@ -2,50 +2,46 @@
 <odoo>
     <data>
         <record id="mail_template_data_new_rank_reached" model="mail.template">
-            <field name="name">New rank reached</field>
+            <field name="name">User: New rank reached</field>
             <field name="model_id" ref="base.model_res_users"/>
-            <field name="subject">Reception of ${object.name}</field>
-            <field name="email_to">${(object.partner_id.email_formatted or object.email) |safe}</field>
-            <field name="partner_to">${object.partner_id.id}</field>
             <field name="subject">New rank: ${object.rank_id.name}</field>
-            <field name="lang">${object.partner_id.lang}</field>
-            <field name="auto_delete" eval="True" />
+            <field name="email_to"></field>
+            <field name="partner_to">${object.partner_id.id}</field>
             <field name="body_html" type="html">
-                <div style="background:#F0F0F0;color:#515166;padding:10px 0px;font-family:Arial,Helvetica,sans-serif;font-size:14px;">
-                 <table style="width:600px;margin:0px auto;background:white;border:1px solid #e1e1e1;">
-                    <tbody>
-                        <tr>
-                            <td style="padding:15px 20px 10px 20px;">
-                                <p>
-                                    Congratulations
-                                    <span>${object.partner_id.name or ''}</span>!
-                                </p>
-                                <p>
-                                    You just reached a new rank : <strong>${object.rank_id.name}</strong>
-                                </p>
-                                <p>Continue your work to become a <strong>${object.next_rank_id.name}</strong> !</p>
-                                <div style="margin: 16px 0px 16px 0px;">
-                                    % set gamification_redirection_data = object.get_gamification_redirection_data()
-                                    % for data in gamification_redirection_data
-                                        % set url = data['url']
-                                        % set label = data['label']
-                                        <a href="${url}" style="background-color: #875A7B; padding: 8px 16px 8px 16px; text-decoration: none; color: #fff; border-radius: 5px; font-size:13px;">${label}</a>
-                                    % endfor
-                                </div>
-                            </td>
-                            <td style="padding:15px 20px 10px 20px;">
-                                <p style="text-align: center;">
-                                    <img src="/web/image/gamification.karma.rank/${object.rank_id.id}/image_medium"/>
-                                </p>
-                            </td>
-                        </tr>
-                    </tbody>
-                 </table>
-                </div>
-                <div>
-                    Thank you,<br/>
+<div style="background:#F0F0F0;color:#515166;padding:10px 0px;font-family:Arial,Helvetica,sans-serif;font-size:14px;">
+<table style="width:600px;margin:0px auto;background:white;border:1px solid #e1e1e1;">
+    <tbody>
+        <tr>
+            <td style="padding:15px 20px 10px 20px;">
+                <p>
+                    Congratulations
+                    <span>${object.name or ''}</span>!
+                </p>
+                <p>
+                    You just reached a new rank : <strong>${object.rank_id.name}</strong>
+                </p>
+                <p>Continue your work to become a <strong>${object.next_rank_id.name}</strong> !</p>
+                <div style="margin: 16px 0px 16px 0px;">
+                    % set gamification_redirection_data = object.get_gamification_redirection_data()
+                    % for data in gamification_redirection_data
+                        % set url = data['url']
+                        % set label = data['label']
+                        <a href="${url}" style="background-color: #875A7B; padding: 8px 16px 8px 16px; text-decoration: none; color: #fff; border-radius: 5px; font-size:13px;">${label}</a>
+                    % endfor
                 </div>
-            </field>
+            </td>
+            <td style="padding:15px 20px 10px 20px;">
+                <p style="text-align: center;">
+                    <img src="/web/image/gamification.karma.rank/${object.rank_id.id}/image_medium"/>
+                </p>
+            </td>
+        </tr>
+    </tbody>
+ </table>
+</div></field>
+            <field name="lang">${object.lang}</field>
+            <field name="auto_delete" eval="True"/>
+            <field name="user_signature" eval="True"/>
         </record>
     </data>
 </odoo>
diff --git a/addons/hr_presence/data/mail_data.xml b/addons/hr_presence/data/mail_data.xml
index 8b5485d46ab..1742f64a376 100644
--- a/addons/hr_presence/data/mail_data.xml
+++ b/addons/hr_presence/data/mail_data.xml
@@ -2,7 +2,7 @@
 <odoo>
     <data noupdate="1">
         <record id="mail_template_presence" model="mail.template">
-            <field name="name">Presence: Contact Employee</field>
+            <field name="name">Employee: Absence email</field>
             <field name="model_id" ref="hr.model_hr_employee"/>
             <field name="subject">Unexpected Absence</field>
             <field name="email_from">${user.email_formatted | safe}</field>
diff --git a/addons/mail/views/res_partner_views.xml b/addons/mail/views/res_partner_views.xml
index 8b7b8a3eac0..8849245c02b 100644
--- a/addons/mail/views/res_partner_views.xml
+++ b/addons/mail/views/res_partner_views.xml
@@ -64,8 +64,9 @@
         <record id="email_template_partner" model="mail.template">
             <field name="name">Partner Mass Mail</field>
             <field name="model_id" ref="base.model_res_partner"/>
-            <field name="auto_delete" eval="True"/>
             <field name="partner_to">${object.id}</field>
+            <field name="user_signature" eval="True"/>
+            <field name="auto_delete" eval="True"/>
             <field name="lang">${object.lang}</field>
         </record>
 
diff --git a/addons/sale/data/mail_data.xml b/addons/sale/data/mail_data.xml
index 8c18eda4358..40cabf7a910 100644
--- a/addons/sale/data/mail_data.xml
+++ b/addons/sale/data/mail_data.xml
@@ -73,9 +73,9 @@
         <record id="email_template_edi_sale" model="mail.template">
             <field name="name">Sales Order: Send by email</field>
             <field name="model_id" ref="sale.model_sale_order"/>
+            <field name="subject">${object.company_id.name} ${object.state in ('draft', 'sent') and 'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })</field>
             <field name="email_from">${(object.user_id.email_formatted or user.email_formatted) | safe}</field>
             <field name="partner_to">${object.partner_id.id}</field>
-            <field name="subject">${object.company_id.name} ${object.state in ('draft', 'sent') and 'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })</field>
             <field name="body_html" type="html">
 <div style="margin: 0px; padding: 0px;">
     <p style="margin: 0px; padding: 0px; font-size: 13px;">
diff --git a/addons/sale_coupon/data/sale_coupon_email_data.xml b/addons/sale_coupon/data/sale_coupon_email_data.xml
index 045265e1f71..afe32281dce 100644
--- a/addons/sale_coupon/data/sale_coupon_email_data.xml
+++ b/addons/sale_coupon/data/sale_coupon_email_data.xml
@@ -84,9 +84,9 @@
             </field>
             <field name="report_template" ref="report_coupon_code"/>
             <field name="report_name">Your Coupon Code</field>
+            <field name="lang">${object.partner_id.lang}</field>
             <field name="auto_delete" eval="True"/>
             <field name="user_signature" eval="False"/>
-            <field name="lang">${object.partner_id.lang}</field>
       </record>
    </data>
 </odoo>
\ No newline at end of file
diff --git a/addons/website_crm_partner_assign/data/crm_partner_assign_data.xml b/addons/website_crm_partner_assign/data/crm_partner_assign_data.xml
index 0461884d845..b72a343b919 100644
--- a/addons/website_crm_partner_assign/data/crm_partner_assign_data.xml
+++ b/addons/website_crm_partner_assign/data/crm_partner_assign_data.xml
@@ -118,6 +118,7 @@
             </field>
             <field name="lang">${ctx['partner_id'].lang}</field>
             <field name="auto_delete" eval="True"/>
+            <field name="user_signature" eval="False"/>
         </record>
     </data>
 
diff --git a/addons/website_profile/data/profile_data.xml b/addons/website_profile/data/profile_data.xml
index ca26a121326..c2c11a65ec6 100644
--- a/addons/website_profile/data/profile_data.xml
+++ b/addons/website_profile/data/profile_data.xml
@@ -102,6 +102,8 @@
 </table>
             </field>
             <field name="lang">${object.lang}</field>
+            <field name="user_signature" eval="False"/>
+            <field name="auto_delete" eval="True"/>
         </record>
     </data>
 </odoo>