[REF] mail, various: remove user_signature field from mail.template

RATIONALE

Mail template model holds a field telling odoo mail engine to automatically
add the current user's signature to the body. Its use depends on the use
case

  * using the template in the composer on a single record: it is displayed
    in the rendered template in the composer, meaning people could change it.
    This behavior is interesting as it allows to see the email content;
  * using the template in the composer in mass mail mode: it is not displayed
    as only the raw jinja is displayed. It is therefore not obvious that it
    will be appended to the body of the mail. People could add it manually and
    have 2 signatures as a result;

A mechanism automatically adding a signature to sent emails when posting a
message is already implemented and is based on template existence. If a
template has been used when posting, no signature is added in sent emails.
Otherwise it is automatically added. This behavior should not change.

Behavior will therefore be

  * use a template -> specify signature usage in it manually through jinja;
  * do not use a template -> signature added in sent emails;

SPECIFICATIONS

Remove user_signature.

Update template body accordingly. In customer oriented templates that are using
it and do not already contain it, manually add a call to user.signature within
the jinja code. When set to False, just remove its declaration.

Quickly clean some signature integration.

LINKS

Task ID 2089252
Community PR odoo/odoo#39482
Enterprise PR odoo/enterprise#6459
Upgrade PR odoo/upgrate#761

Related: odoo/enterprise#6459
Related: odoo/upgrade#761
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
Co-authored-by: Michaël Mattiello <mcm@odoo.com>
Co-authored-by: Thibault Delavallée <tde@odoo.com>

32 files changed, 77 insertions, 92 deletions

diff --git a/addons/account/data/mail_template_data.xml b/addons/account/data/mail_template_data.xml
index c3fcb7f9d7d..628e3215dde 100644
--- a/addons/account/data/mail_template_data.xml
+++ b/addons/account/data/mail_template_data.xml
@@ -39,13 +39,16 @@
         % endif
         <br /><br />
         Do not hesitate to contact us if you have any questions.
+        % if object.invoice_user_id.signature:
+            <br />
+            ${object.invoice_user_id.signature | safe}
+        % endif
     </p>
 </div>
             </field>
             <field name="report_template" ref="account_invoices"/>
             <field name="report_name">Invoice_${(object.name or '').replace('/','_')}${object.state == 'draft' and '_draft' or ''}</field>
             <field name="lang">${object.partner_id.lang}</field>
-            <field name="user_signature" eval="False"/>
             <field name="auto_delete" eval="True"/>
         </record>
     </data>
diff --git a/addons/account/data/payment_receipt_data.xml b/addons/account/data/payment_receipt_data.xml
index 6159af2e6c6..22ae398ad14 100644
--- a/addons/account/data/payment_receipt_data.xml
+++ b/addons/account/data/payment_receipt_data.xml
@@ -18,9 +18,10 @@
         <br /><br />
         Do not hesitate to contact us if you have any questions.
         <br/><br/>
-        Best regards,<br/>
-        % if user and user.signature:
-        ${user.signature | safe}
+        Best regards,
+        % if user.signature:
+            <br/>
+            ${user.signature | safe}
         % endif
     </p>
 </div>
@@ -29,7 +30,6 @@
             <field name="report_name">${(object.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>
 
         <act_window name="Send receipt by email"
diff --git a/addons/auth_signup/data/auth_signup_data.xml b/addons/auth_signup/data/auth_signup_data.xml
index e83930f0b88..10505628870 100644
--- a/addons/auth_signup/data/auth_signup_data.xml
+++ b/addons/auth_signup/data/auth_signup_data.xml
@@ -50,8 +50,11 @@
                             </a>
                         </div>
                         If you do not expect this, you can safely ignore this email.<br/><br/>
-                        Thanks,<br/>
-                        ${user.signature | safe}<br/>
+                        Thanks,
+                        % if user.signature:
+                            <br/>
+                            ${user.signature | safe}
+                        % endif
                     </div>
                 </td></tr>
                 <tr><td style="text-align:center;">
@@ -96,7 +99,6 @@
             </field>
             <field name="lang">${object.lang}</field>
             <field name="auto_delete" eval="True"/>
-            <field name="user_signature" eval="False"/>
         </record>
 
         <!-- Email template for new users -->
@@ -194,7 +196,6 @@
 </table></field>
             <field name="lang">${object.lang}</field>
             <field name="auto_delete" eval="True"/>
-            <field name="user_signature" eval="False"/>
         </record>
 
         <!-- Email template for reminder of unregistered users -->
@@ -246,7 +247,6 @@
             </field>
             <field name="lang">${object.partner_id.lang}</field>
             <field name="auto_delete" eval="True"/>
-            <field name="user_signature" eval="False"/>
         </record>
 
         <!-- Email template for new users that used a signup token -->
@@ -294,8 +294,11 @@
                                 Go to My Account
                             </a>
                         </div>
-                        Thanks,<br/><br />
-                        ${user.signature | safe}<br/>
+                        Thanks,<br/>
+                        % if user.signature:
+                            <br/>
+                            ${user.signature | safe}
+                        % endif
                     </div>
                 </td></tr>
                 <tr><td style="text-align:center;">
@@ -339,7 +342,6 @@
 </table></field>
             <field name="lang">${object.lang}</field>
             <field name="auto_delete" eval="True"/>
-            <field name="user_signature" eval="False"/>
         </record>
 
     </data>
diff --git a/addons/calendar/data/mail_data.xml b/addons/calendar/data/mail_data.xml
index 97f34f162ff..70e1e1a5977 100644
--- a/addons/calendar/data/mail_data.xml
+++ b/addons/calendar/data/mail_data.xml
@@ -75,15 +75,14 @@
     </tr></table>
     <br/>
     Thank you,
-    <br/>
-    % if object.event_id.user_id and object.event_id.user_id.signature:
+    % if object.event_id.user_id.signature:
+        <br />
         ${object.event_id.user_id.signature | safe}
     % endif
 </div>
             </field>
             <field name="lang">${object.partner_id.lang}</field>
             <field name="auto_delete" eval="True"/>
-            <field name="user_signature" eval="False"/>
         </record>
 
         <record id="calendar_template_meeting_changedate" model="mail.template">
@@ -160,15 +159,14 @@
     </tr></table>
     <br/>
     Thank you,
-    <br/>
-    % if object.event_id.user_id and object.event_id.user_id.signature:
+    % if object.event_id.user_id.signature:
+        <br />
         ${object.event_id.user_id.signature | safe}
     % endif
 </div>
             </field>
             <field name="lang">${object.partner_id.lang}</field>
             <field name="auto_delete" eval="True"/>
-            <field name="user_signature" eval="False"/>
         </record>
 
         <record id="calendar_template_meeting_reminder" model="mail.template">
@@ -250,15 +248,14 @@
     </tr></table>
     <br/>
     Thank you,
-    <br/>
-    % if object.event_id.user_id and object.event_id.user_id.signature:
+    % if object.event_id.user_id.signature:
+        <br />
         ${object.event_id.user_id.signature | safe}
     % endif
 </div>
             </field>
             <field name="lang">${object.partner_id.lang}</field>
             <field name="auto_delete" eval="True"/>
-            <field name="user_signature" eval="False"/>
         </record>
     </data>
 </odoo>
diff --git a/addons/digest/data/digest_template_data.xml b/addons/digest/data/digest_template_data.xml
index 07c0994edaf..2b9e607796d 100644
--- a/addons/digest/data/digest_template_data.xml
+++ b/addons/digest/data/digest_template_data.xml
@@ -160,6 +160,5 @@
 </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 11827e2e829..9ee4351ff89 100644
--- a/addons/event/data/email_template_data.xml
+++ b/addons/event/data/email_template_data.xml
@@ -15,8 +15,9 @@
     Here is your badge for the event ${object.event_id.name}.<br/>
     If you have any questions, please let us know.
     <br/><br/>
-    Thank you,<br/>
-    % if object.event_id.user_id and object.event_id.user_id.signature:
+    Thank you,
+    % if object.event_id.user_id.signature:
+        <br />
         ${object.event_id.user_id.signature | safe}
     % endif
 </div></field>
@@ -24,7 +25,6 @@
             <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">
@@ -221,7 +221,6 @@
 </table>
             </field>
             <field name="lang">${object.partner_id.lang}</field>
-            <field name="user_signature" eval="False"/>
         </record>
 
         <record id="event_reminder" model="mail.template">
@@ -418,7 +417,6 @@
 </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 696e3fabec7..fb7c3c6a436 100644
--- a/addons/gamification/data/badge.xml
+++ b/addons/gamification/data/badge.xml
@@ -89,8 +89,8 @@
                         % endif
                         <br/><br/>
                         Thank you,
-                        <br/>
-                        % if object.sender_id and object.sender_id.signature:
+                        % if object.sender_id.signature:
+                            <br />
                             ${object.sender_id.signature | safe}
                         % endif
                     </div>
@@ -135,7 +135,6 @@
 </td></tr>
 </table></field>
             <field name="lang">${object.user_id.lang}</field>
-            <field name="user_signature" eval="False"/>
             <field name="auto_delete" eval="True"/>
         </record>
     </data>
diff --git a/addons/gamification/data/goal_base.xml b/addons/gamification/data/goal_base.xml
index a133c93c020..a347e17a186 100644
--- a/addons/gamification/data/goal_base.xml
+++ b/addons/gamification/data/goal_base.xml
@@ -11,16 +11,15 @@
             <field name="body_html" type="html">
 <div>
     <strong>Reminder ${object.name}</strong><br/>
-You have not updated your progress for the goal ${object.definition_id.name} (currently reached at ${object.completeness}%) for at least ${object.remind_update_delay} days. Do not forget to do it.
-<br/><br/>
-Thank you,
-    <br/>
-    % if object.challenge_id.manager_id and object.challenge_id.manager_id.signature:
-    ${object.challenge_id.manager_id.signature | safe}
+    You have not updated your progress for the goal ${object.definition_id.name} (currently reached at ${object.completeness}%) for at least ${object.remind_update_delay} days. Do not forget to do it.
+    <br/><br/>
+    Thank you,
+    % if object.challenge_id.manager_id.signature:
+        <br />
+        ${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>
         
diff --git a/addons/gamification/views/mail_templates.xml b/addons/gamification/views/mail_templates.xml
index 4f589833bf1..641d505567a 100644
--- a/addons/gamification/views/mail_templates.xml
+++ b/addons/gamification/views/mail_templates.xml
@@ -36,12 +36,18 @@
                 </p>
             </td>
         </tr>
+        % if user.signature
+        <tr>
+            <td style="padding:15px 20px 10px 20px;">
+                ${user.signature | safe}
+            </td>
+        </tr>
+        % endif
     </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/data/hr_data.xml b/addons/hr/data/hr_data.xml
index 41e343de6d4..60601583cd1 100644
--- a/addons/hr/data/hr_data.xml
+++ b/addons/hr/data/hr_data.xml
@@ -96,7 +96,6 @@
             </field>
             <field name="lang">${user.lang}</field>
             <field name="auto_delete" eval="True"/>
-            <field name="user_signature" eval="False"/>
         </record>
 
         <record model="ir.config_parameter" id="hr_presence_control_login" forcecreate="False">
diff --git a/addons/hr_recruitment/data/hr_recruitment_data.xml b/addons/hr_recruitment/data/hr_recruitment_data.xml
index 5c233c356a7..2428628ab79 100644
--- a/addons/hr_recruitment/data/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/data/hr_recruitment_data.xml
@@ -57,7 +57,6 @@
     </tr>
 </table>
         </field>
-        <field name="user_signature" eval="False"/>
         <field name="auto_delete" eval="True"/>
         <field name="lang">${object.partner_id.lang or ''}</field>
     </record>
@@ -167,7 +166,6 @@
         </td>
     </tr>
 </table></field>
-        <field name="user_signature" eval="False"/>
         <field name="auto_delete" eval="True"/>
         <field name="lang">${object.partner_id.lang or ''}</field>
     </record>
@@ -261,7 +259,6 @@
         </td>
     </tr>
 </table></field>
-        <field name="user_signature" eval="False"/>
         <field name="auto_delete" eval="True"/>
         <field name="lang">${object.partner_id.lang or ''}</field>
     </record>
diff --git a/addons/mail/models/mail_template.py b/addons/mail/models/mail_template.py
index 871a3302d65..1d455c4306f 100644
--- a/addons/mail/models/mail_template.py
+++ b/addons/mail/models/mail_template.py
@@ -101,9 +101,6 @@ class MailTemplate(models.Model):
                             "that provides the appropriate language, e.g. "
                             "${object.partner_id.lang}.",
                        placeholder="${object.partner_id.lang}")
-    user_signature = fields.Boolean('Add Signature',
-                                    help="If checked, the user's signature will be appended to the text version "
-                                         "of the message")
     subject = fields.Char('Subject', translate=True, help="Subject (placeholders may be used here)")
     email_from = fields.Char('From',
                              help="Sender address (placeholders may be used here). If not set, the default "
@@ -357,11 +354,6 @@ class MailTemplate(models.Model):
             # update values for all res_ids
             for res_id in template_res_ids:
                 values = results[res_id]
-                # body: add user signature, sanitize
-                if 'body_html' in fields and template.user_signature:
-                    signature = self.env.user.signature
-                    if signature:
-                        values['body_html'] = tools.append_content_to_html(values['body_html'], signature, plaintext=False)
                 if values.get('body_html'):
                     values['body'] = tools.html_sanitize(values['body_html'])
                 # technical settings
diff --git a/addons/mail/views/mail_template_views.xml b/addons/mail/views/mail_template_views.xml
index 261137923d5..a3f7f430b98 100644
--- a/addons/mail/views/mail_template_views.xml
+++ b/addons/mail/views/mail_template_views.xml
@@ -60,7 +60,6 @@
                                             placeholder="Comma-separated carbon copy recipients addresses"/>
                                     <field name="reply_to"
                                             placeholder="Preferred reply address"/>
-                                    <field name="user_signature" string="Author Signature (mass mail only)"/>
                                     <field name="scheduled_date" string="Scheduled Send Date"/>
                                 </group>
                             </page>
diff --git a/addons/mail/views/res_partner_views.xml b/addons/mail/views/res_partner_views.xml
index 621c35e8423..42c1d494bb7 100644
--- a/addons/mail/views/res_partner_views.xml
+++ b/addons/mail/views/res_partner_views.xml
@@ -85,7 +85,6 @@
             <field name="name">Partner Mass Mail</field>
             <field name="model_id" ref="base.model_res_partner"/>
             <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/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 520b8f94339..26a5599e8ad 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -374,9 +374,6 @@ class MailComposer(models.TransientModel):
                 values['attachment_ids'] = [att.id for att in template.attachment_ids]
             if template.mail_server_id:
                 values['mail_server_id'] = template.mail_server_id.id
-            if template.user_signature and 'body_html' in values:
-                signature = self.env.user.signature
-                values['body_html'] = tools.append_content_to_html(values['body_html'], signature, plaintext=False)
         elif template_id:
             values = self.generate_email_for_composer(
                 template_id, [res_id],
diff --git a/addons/portal/data/portal_data.xml b/addons/portal/data/portal_data.xml
index 04331178a48..18ce8b95bc8 100644
--- a/addons/portal/data/portal_data.xml
+++ b/addons/portal/data/portal_data.xml
@@ -92,7 +92,6 @@
             </field>
             <field name="lang">${object.partner_id.lang}</field>
             <field name="auto_delete" eval="True"/>
-            <field name="user_signature" eval="False"/>
         </record>
         <template id="portal_share_template">
             <div>
diff --git a/addons/project/data/project_mail_template_data.xml b/addons/project/data/project_mail_template_data.xml
index 26aea632b51..d6cd9e4ce4b 100644
--- a/addons/project/data/project_mail_template_data.xml
+++ b/addons/project/data/project_mail_template_data.xml
@@ -14,12 +14,14 @@
     If you have any questions, please let us know.
     <br/><br/>
     Thank you,
-    <br/>
+    % if user.signature
+        <br />
+        ${user.signature | safe}
+    % endif
 </div>
         </field>
             <field name="lang">${object.partner_id.lang}</field>
             <field name="auto_delete" eval="True"/>
-            <field name="user_signature" eval="True"/>
         </record>
 
         <!-- Mail sent to request a rating for a task -->
@@ -88,7 +90,6 @@
             </field>
             <field name="lang">${object.rating_get_partner_id().lang}</field>
             <field name="auto_delete" eval="True"/>
-            <field name="user_signature" eval="False"/>
         </record>
     </data>
 </odoo>
diff --git a/addons/purchase/data/mail_template_data.xml b/addons/purchase/data/mail_template_data.xml
index 3f8cf886164..dff26e49227 100644
--- a/addons/purchase/data/mail_template_data.xml
+++ b/addons/purchase/data/mail_template_data.xml
@@ -28,7 +28,6 @@
             <field name="report_template" ref="report_purchase_quotation"/>
             <field name="report_name">RFQ_${(object.name or '').replace('/','_')}</field>
             <field name="lang">${object.partner_id.lang}</field>
-            <field name="user_signature" eval="False"/>
             <field name="auto_delete" eval="True"/>
         </record>
 
@@ -60,7 +59,6 @@
             <field name="report_template" ref="action_report_purchase_order"/>
             <field name="report_name">PO_${(object.name or '').replace('/','_')}</field>
             <field name="lang">${object.partner_id.lang}</field>
-            <field name="user_signature" eval="False"/>
             <field name="auto_delete" eval="True"/>
         </record>
     </data>
diff --git a/addons/repair/data/repair_data.xml b/addons/repair/data/repair_data.xml
index 8a7fc9ac178..1fbdd62c191 100644
--- a/addons/repair/data/repair_data.xml
+++ b/addons/repair/data/repair_data.xml
@@ -23,13 +23,16 @@
         You can reply to this email if you have any questions.
         <br/><br/>
         Thank you,
+        % if user.signature
+            <br />
+            ${user.signature | safe}
+        % endif
     </p>
 </div></field>
             <field name="report_template" ref="action_report_repair_order"/>
             <field name="report_name">${(object.name or '').replace('/','_')}</field>
             <field name="lang">${object.partner_id.lang}</field>
             <field name="auto_delete" eval="True"/>
-            <field name="user_signature" eval="True"/>
         </record>
     </data>
 </odoo>
diff --git a/addons/sale/data/mail_data.xml b/addons/sale/data/mail_data.xml
index 0b66f309e04..e1d72bb931e 100644
--- a/addons/sale/data/mail_data.xml
+++ b/addons/sale/data/mail_data.xml
@@ -108,7 +108,6 @@
             <field name="report_template" ref="action_report_saleorder"/>
             <field name="report_name">${(object.name or '').replace('/','_')}</field>
             <field name="lang">${object.partner_id.lang}</field>
-            <field name="user_signature" eval="False"/>
             <field name="auto_delete" eval="True"/>
         </record>
 
@@ -253,7 +252,6 @@
             <field name="report_template" ref="action_report_saleorder"/>
             <field name="report_name">${(object.name or '').replace('/','_')}</field>
             <field name="lang">${object.partner_id.lang}</field>
-            <field name="user_signature" eval="False"/>
             <field name="auto_delete" eval="True"/>
         </record>
     </data>
diff --git a/addons/sale_coupon/data/sale_coupon_email_data.xml b/addons/sale_coupon/data/sale_coupon_email_data.xml
index 6d09a51e62c..2a5731ef464 100644
--- a/addons/sale_coupon/data/sale_coupon_email_data.xml
+++ b/addons/sale_coupon/data/sale_coupon_email_data.xml
@@ -88,8 +88,8 @@
         % endif
         <br/>
         Thank you,
-        <br/>
-        % if object.order_id.user_id:
+        % if object.order_id.user_id.signature:
+            <br />
             ${object.order_id.user_id.signature | safe}
         % endif
     </td></tr>
@@ -99,7 +99,6 @@
             <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"/>
       </record>
 
         <record id="expire_coupon_cron" model="ir.cron">
diff --git a/addons/stock/data/mail_template_data.xml b/addons/stock/data/mail_template_data.xml
index b1cc5e4d567..06cfee0f7b2 100644
--- a/addons/stock/data/mail_template_data.xml
+++ b/addons/stock/data/mail_template_data.xml
@@ -22,9 +22,10 @@
         %endif
         <br/><br/>
         Please find your delivery order attached for more details.<br/><br/>
-        Thank you,<br/>
-        % if user and user.signature:
-          ${user.signature | safe}
+        Thank you,
+        % if user.signature:
+            <br />
+            ${user.signature | safe}
         % endif
     </p>
 </div>
@@ -33,7 +34,6 @@
         <field name="report_name">${(object.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>
 </data>
 </odoo>
diff --git a/addons/survey/data/mail_template_data.xml b/addons/survey/data/mail_template_data.xml
index 8a7c0439a79..e27c4dbbe5f 100644
--- a/addons/survey/data/mail_template_data.xml
+++ b/addons/survey/data/mail_template_data.xml
@@ -34,7 +34,6 @@
             </field>
             <field name="lang">${object.partner_id.lang}</field>
             <field name="auto_delete" eval="True"/>
-            <field name="user_signature" eval="False"/>
         </record>
 
         <!-- Certification Email template -->
@@ -74,7 +73,6 @@
             <field name="report_name">Certification Document</field>
             <field name="lang">${object.partner_id.lang}</field>
             <field name="auto_delete" eval="True"/>
-            <field name="user_signature" eval="False"/>
         </record>
     </data>
 </odoo>
\ No newline at end of file
diff --git a/addons/test_mail/tests/common.py b/addons/test_mail/tests/common.py
index 77cef2ce183..a1b7c7000ea 100644
--- a/addons/test_mail/tests/common.py
+++ b/addons/test_mail/tests/common.py
@@ -45,7 +45,6 @@ class TestMailCommon(common.SavepointCase, mail_common.MailCase):
             'subject': 'About ${object.name}',
             'body_html': '<p>Hello ${object.name}</p>',
             'model_id': cls.env['ir.model']._get(model).id,
-            'user_signature': False,
         }
         if template_values:
             create_values.update(template_values)
diff --git a/addons/test_mail/tests/test_performance.py b/addons/test_mail/tests/test_performance.py
index d9a722ed63b..9bbfb71b273 100644
--- a/addons/test_mail/tests/test_performance.py
+++ b/addons/test_mail/tests/test_performance.py
@@ -197,7 +197,6 @@ class TestMailAPIPerformance(BaseMailPerformance):
             'email_from': '${object.user_id.email_formatted | safe}',
             'partner_to': '${object.customer_id.id}',
             'email_to': '${("%s Customer <%s>" % (object.name, object.email_from)) | safe}',
-            'user_signature': False,
         })
 
         # automatically follow activities, for backward compatibility concerning query count
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 b72a343b919..0461884d845 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,7 +118,6 @@
             </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_event_track/data/event_track_data.xml b/addons/website_event_track/data/event_track_data.xml
index ed5ae45edb1..6b1084be59d 100644
--- a/addons/website_event_track/data/event_track_data.xml
+++ b/addons/website_event_track/data/event_track_data.xml
@@ -21,10 +21,12 @@
     </div>
     <br/><br/>
     Thank you,
-</div>
-            </field>
+    % if user.signature
+        <br />
+        ${user.signature | safe}
+    % endif
+</div></field>
             <field name="lang">${object.partner_id.lang}</field>
-            <field name="user_signature" eval="True"/>
             <field name="auto_delete" eval="True"/>
         </record>
 
diff --git a/addons/website_mail_channel/data/mail_template_data.xml b/addons/website_mail_channel/data/mail_template_data.xml
index 8d04ca72122..0f3056ea2c4 100644
--- a/addons/website_mail_channel/data/mail_template_data.xml
+++ b/addons/website_mail_channel/data/mail_template_data.xml
@@ -39,8 +39,8 @@
                         <br/><br/>
                         If this was a mistake or you did not requested this action, please ignore this message.
                         % if user.signature
-                        <br/>
-                        ${user.signature | safe}
+                            <br/>
+                            ${user.signature | safe}
                         % endif
                     </div>
                 </td></tr>
@@ -86,7 +86,6 @@
 </table>
             </field>
             <field name="auto_delete" eval="True"/>
-            <field name="user_signature" eval="False"/>
         </record>
 
         <record id="mail_template_list_unsubscribe" model="mail.template">
@@ -126,8 +125,8 @@
                         <br/><br/>
                         If this was a mistake or you did not requested this action, please ignore this message.
                         % if user.signature:
-                        <br/>
-                        ${user.signature | safe}
+                            <br/>
+                            ${user.signature | safe}
                         % endif
                     </div>
                 </td></tr>
@@ -173,7 +172,6 @@
 </table>
             </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 c2c11a65ec6..13e46434b25 100644
--- a/addons/website_profile/data/profile_data.xml
+++ b/addons/website_profile/data/profile_data.xml
@@ -102,7 +102,6 @@
 </table>
             </field>
             <field name="lang">${object.lang}</field>
-            <field name="user_signature" eval="False"/>
             <field name="auto_delete" eval="True"/>
         </record>
     </data>
diff --git a/addons/website_sale/data/mail_template_data.xml b/addons/website_sale/data/mail_template_data.xml
index 25ccc2e3c7e..2f8dc2f9e15 100644
--- a/addons/website_sale/data/mail_template_data.xml
+++ b/addons/website_sale/data/mail_template_data.xml
@@ -105,7 +105,6 @@
             </field>
             <field name="lang">${object.partner_id.lang}</field>
             <field name="auto_delete" eval="False"/>
-            <field name="user_signature" eval="False"/>
         </record>
     </data>
 </odoo>
diff --git a/addons/website_slides/data/mail_data.xml b/addons/website_slides/data/mail_data.xml
index 88c8a45cd5a..cda332ba5cf 100644
--- a/addons/website_slides/data/mail_data.xml
+++ b/addons/website_slides/data/mail_data.xml
@@ -23,11 +23,14 @@
                                 style="background-color: #875a7b; padding: 8px 16px 8px 16px; text-decoration: none; color: #fff; border-radius: 5px;">View content</a>
                         </div>
                         Enjoy this exclusive content!
+                        % if user.signature
+                            <br />
+                            ${user.signature | safe}
+                        % endif
                     </p>
                 </div>
             </field>
             <field name="auto_delete" eval="True"/>
-            <field name="user_signature" eval="True"/>
         </record>
 
         <record id="slide_template_shared" model="mail.template">
@@ -50,11 +53,14 @@
                             <a href="${(object.website_url + '?fullscreen=1') if ctx['fullscreen'] else object.website_url | safe}"
                                 style="background-color: #875a7b; padding: 8px 16px 8px 16px; text-decoration: none; color: #fff; border-radius: 5px;">View <strong>${object.name}</strong></a>
                         </div>
+                        % if user.signature
+                            <br />
+                            ${user.signature | safe}
+                        % endif
                     </p>
                 </div>
             </field>
             <field name="auto_delete" eval="True"/>
-            <field name="user_signature" eval="True"/>
         </record>
 
         <!-- Channel subtypes -->
@@ -83,12 +89,15 @@
             </a>
         </div>
         Enjoy this exclusive content !
+        % if user.signature
+            <br />
+            ${user.signature | safe}
+        % endif
     </p>
 </div>
             </field>
             <field name="lang">${object.partner_id.lang}</field>
             <field name="auto_delete" eval="True"/>
-            <field name="user_signature" eval="False"/>
         </record>
     </data>
 </odoo>
diff --git a/addons/website_slides_survey/data/mail_template_data.xml b/addons/website_slides_survey/data/mail_template_data.xml
index 49f1b72206a..0d2ce38801e 100644
--- a/addons/website_slides_survey/data/mail_template_data.xml
+++ b/addons/website_slides_survey/data/mail_template_data.xml
@@ -24,7 +24,6 @@
             </field>
             <field name="lang">${object.partner_id.lang}</field>
             <field name="auto_delete" eval="True"/>
-            <field name="user_signature" eval="False"/>
         </record>
     </data>
 </odoo>