diff --git a/addons/account/data/mail_template_data.xml b/addons/account/data/mail_template_data.xml
index c3fcb7f9d7d35d8b8598da6a4f9af76339cbc553..628e3215ddeed5e2fd341812f17cacee529db230 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 6159af2e6c63625fda3d510d88e7eb384a902bba..22ae398ad1441dc5bb0ddb0f8d4c1ffe1d55abbf 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 e83930f0b88a37f11a8794d14999074222f7428c..105056288701fa96456fb5a812dff3475c1d0df3 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 97f34f162fff4de7647e4e25b489671e2c9ffc2c..70e1e1a5977381ce59ffbd692d80d8990464ab82 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 07c0994edaf8fd71d0d40e1922948a3c652c45a4..2b9e607796d9e6772db35a58f0de9d47f0c8aeeb 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 11827e2e82932f915b771e10cb484ffd1efdf37f..9ee4351ff892bacfff793211e8ef778bb3c70dea 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 696e3fabec709c5d64ffd5bda40502efb8b22b55..fb7c3c6a436028252c5fd596659c36b80a2eee7a 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 a133c93c020134610f8cca139efb09a8aac0539c..a347e17a186956301ea9c9371164f9e50b37c705 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 4f589833bf16c58c29d8dac25732f53016999b48..641d505567a1a9b7072945c761f741208e3b6d1e 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 41e343de6d4e43275ee99e41316774c19d1f9343..60601583cd10a2fa8394c84bc27e3e9eca8d5159 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 5c233c356a7de7d4e702c047a26e404007abcc4b..2428628ab79fe16dce5862447000fef7f6c85fc8 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 871a3302d65d9e14d1fb9720c6eac04bc5dcd98a..1d455c4306fb52da5198e900fbbf7f8c340762fb 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 261137923d5eefc3ed1f59fc298314d8c6b2836a..a3f7f430b98d94414f8469488e4f3a5199ded7cb 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 621c35e8423bfe3ff88ce4b8af860adcf0acdac4..42c1d494bb7b37d8ae6892f124016c0b8624e86e 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 520b8f9433980c4243fa25d57249fb173ccb5a39..26a5599e8adc3fc0e8d4f272662862964f920fd5 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 04331178a4831c6ce4541b4591b0517d717a8f7f..18ce8b95bc88d30069989dfa1589d4c0b71e9168 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 26aea632b513331bfb5fbeb282dbf156f7a01026..d6cd9e4ce4b6b1812deaa981fca9b15379535eca 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 3f8cf886164b04bab40b5e13e40aba0c7abc2388..dff26e49227d00bd012db992483b9566f6fb8714 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 8a7fc9ac17881841a28b3dc047858d72f01680a2..1fbdd62c1913c29dde0854b492d3fc5351b2d222 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 0b66f309e04e7b15faf7b64ea4fd6261c1c80fdd..e1d72bb931e8a0964f3c7985656cdf820e759fe2 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 6d09a51e62ce5d47fe8321b2d78e6c651433fdba..2a5731ef464d338988fbbfe674caee9985ec429e 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 b1cc5e4d567293af6c528bf9dddb1175138462cb..06cfee0f7b2172fb379e0dd9e8119d0e3dc8bc94 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 8a7c0439a7926f9a6c6fe46c21f8099a5c5ad34c..e27c4dbbe5f742979a4d7af63edd81bdfff73a77 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 77cef2ce18386f86e3c4b3b8c30f32e5f651e68c..a1b7c7000ead384d7ed8b17647b275a71fb85e66 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 d9a722ed63b4092f9c6a39a3ac476d4beb7f4439..9bbfb71b2739f262a8dcccd40f61abeac860eb2c 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 b72a343b9196d0a7f636ca38c36424009a30febf..0461884d845f438f3b3621eba8ffc3f7145e144c 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 ed5ae45edb1a3da9b7c1b1c78ce74d8ee6d76c8a..6b1084be59da10274e79ea6556309e6b566d05cc 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 8d04ca72122199cbed110102fb5c2d499e447fb6..0f3056ea2c482da20982c53691a467184c13d6e1 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 c2c11a65ec68b66d1986f1399f3b3a5f3b3266d2..13e46434b25bae064233a260ebd27482bca4b73c 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 25ccc2e3c7e9604d8253c8e63d26eff666ee6706..2f8dc2f9e15009926f525a92ba3c335e88792c24 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 88c8a45cd5af500c0ea0b9018128c95440025edd..cda332ba5cf714fd323ec3dbe147b7e93777864f 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 49f1b72206a84a1c15787dabd59bfca6851408c4..0d2ce38801ed17cdd0961c4db56c735fdaaa8762 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>