diff options
| author | Thibault Delavallée <tde@odoo.com> | 2019-04-23 12:37:17 +0000 |
|---|---|---|
| committer | Thibault Delavallée <tde@odoo.com> | 2019-04-23 14:26:50 +0000 |
| commit | a7ac71ed4404aa2630619c331d725f4f545626f8 (patch) | |
| tree | a5cf9f8d151868b2954204a046c61ddaca3bfe35 /addons/gamification/data | |
| parent | 678e04c19dbfefaadd8ab6207b0bb560a3d3bfe4 (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/gamification/data')
| -rw-r--r-- | addons/gamification/data/badge.xml | 9 | ||||
| -rw-r--r-- | addons/gamification/data/goal_base.xml | 6 |
2 files changed, 8 insertions, 7 deletions
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;"> |