summaryrefslogtreecommitdiff
path: root/addons/event/data
diff options
context:
space:
mode:
authorThibault Delavallée <tde@odoo.com>2019-04-23 12:37:17 +0000
committerThibault Delavallée <tde@odoo.com>2019-04-23 14:26:50 +0000
commita7ac71ed4404aa2630619c331d725f4f545626f8 (patch)
treea5cf9f8d151868b2954204a046c61ddaca3bfe35 /addons/event/data
parent678e04c19dbfefaadd8ab6207b0bb560a3d3bfe4 (diff)
[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>
Diffstat (limited to 'addons/event/data')
-rw-r--r--addons/event/data/email_template_data.xml5
1 files changed, 3 insertions, 2 deletions
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>