From a7ac71ed4404aa2630619c331d725f4f545626f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 23 Apr 2019 12:37:17 +0000 Subject: [PATCH] [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) --- .../crm_iap_lead/data/crm_iap_lead_data.xml | 18 ++--- addons/digest/data/digest_template_data.xml | 23 +++--- addons/event/data/email_template_data.xml | 5 +- addons/gamification/data/badge.xml | 9 +-- addons/gamification/data/goal_base.xml | 6 +- addons/gamification/models/goal.py | 1 + addons/gamification/views/mail_templates.xml | 76 +++++++++---------- addons/hr_presence/data/mail_data.xml | 2 +- addons/mail/views/res_partner_views.xml | 3 +- addons/sale/data/mail_data.xml | 2 +- .../data/sale_coupon_email_data.xml | 2 +- .../data/crm_partner_assign_data.xml | 1 + addons/website_profile/data/profile_data.xml | 2 + 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 @@ iap@odoo.com IAP Lead Generation Notification - - Dear,

-

There is no more credits on your IAP Lead Generation account.
- You can charge your IAP Lead Generation account in the settings of the CRM app.
- -

Best regards,

-

Odoo S.A.

- ]]> - + +
+

Dear,

+

There is no more credits on your IAP Lead Generation account.
+ You can charge your IAP Lead Generation account in the settings of the CRM app.

+

Best regards,

+

Odoo S.A.

+
 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 @@ Digest: Default main template - ${user.email_formatted | safe} - ${user.lang} - ${'%s: %s' % (ctx.get('user', user).company_id.name, object.name)} +
@@ -54,10 +53,10 @@ Yesterday % if data['yesterday'][kpi]['margin'] != 0.0: - % if data['yesterday'][kpi]['margin'] > 0.0: + % if data['yesterday'][kpi]['margin'] > 0.0: ▲${"%.2f" % data['yesterday'][kpi]['margin']} % % endif - % if data['yesterday'][kpi]['margin'] < 0.0: + % if data['yesterday'][kpi]['margin'] < 0.0: ▼${"%.2f" % data['yesterday'][kpi]['margin']} % % endif @@ -74,10 +73,10 @@ Last 7 Days % if data['lastweek'][kpi]['margin'] != 0.0: - % if data['lastweek'][kpi]['margin'] > 0.0: + % if data['lastweek'][kpi]['margin'] > 0.0: ▲${"%.2f" % data['lastweek'][kpi]['margin']} % % endif - % if data['lastweek'][kpi]['margin'] < 0.0: + % if data['lastweek'][kpi]['margin'] <0.0: ▼${"%.2f" % data['lastweek'][kpi]['margin']} % %endif @@ -94,10 +93,10 @@ Last 30 Days % if data['lastmonth'][kpi]['margin'] != 0.0: - % if data['lastmonth'][kpi]['margin'] > 0.0: + % if data['lastmonth'][kpi]['margin'] > 0.0: ▲${"%.2f" % data['lastmonth'][kpi]['margin']} % % endif - % if data['lastmonth'][kpi]['margin'] < 0.0: + % if data['lastmonth'][kpi]['margin'] < 0.0: ▼${"%.2f" % data['lastmonth'][kpi]['margin']} % %endif @@ -155,7 +154,9 @@
- - ]]> + + ${user.lang} + + 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 @@ badge_of_${(object.event_id.name or '').replace('/','_')} ${object.partner_id.lang} + @@ -32,7 +33,6 @@ Your registration at ${object.event_id.name} ${(object.event_id.organizer_id.email_formatted or object.event_id.user_id.email_formatted or '') | safe} ${(object.partner_id.email_formatted or '"%s" <%s>' % (object.name, object.email) or '') | safe} -
% set date_begin = format_tz(object.event_id.date_begin, tz='UTC', format='%Y%m%dT%H%M%SZ') @@ -221,6 +221,7 @@
${object.partner_id.lang} + @@ -229,7 +230,6 @@ ${object.event_id.name}: ${object.get_date_range_str()} ${(object.event_id.organizer_id.email_formatted or object.event_id.user_id.email_formatted or '') | safe} ${(object.partner_id.email_formatted or '"%s" <%s>' % (object.name, object.email) or '') | safe} -
% set date_begin = format_tz(object.event_id.date_begin, tz='UTC', format='%Y%m%dT%H%M%SZ') @@ -418,6 +418,7 @@
${object.partner_id.lang} + 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 @@ New badge ${object.badge_id.name} granted ${object.user_id.partner_id.id} - ${object.user_id.lang} -
@@ -134,10 +133,10 @@
- - - + + ${object.user_id.lang} + + 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 @@ Goal: Reminder for Goal Update - ${object.user_id.lang} ${object.user_id.partner_id.id}
@@ -20,10 +19,13 @@ Thank you, ${object.challenge_id.manager_id.signature | safe} % endif
+ ${object.user_id.lang} + + - Simple Challenge Report Progress + Challenge: Simple Challenge Report Progress 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 @@ - New rank reached + User: New rank reached - Reception of ${object.name} - ${(object.partner_id.email_formatted or object.email) |safe} - ${object.partner_id.id} New rank: ${object.rank_id.name} - ${object.partner_id.lang} - + + ${object.partner_id.id} -
-
- - - - - - -
-

- Congratulations - ${object.partner_id.name or ''}! -

-

- You just reached a new rank : ${object.rank_id.name} -

-

Continue your work to become a ${object.next_rank_id.name} !

-
- % set gamification_redirection_data = object.get_gamification_redirection_data() - % for data in gamification_redirection_data - % set url = data['url'] - % set label = data['label'] - ${label} - % endfor -
- 		-

- -

-
+
+ + + + + + + +
+

+ Congratulations + ${object.name or ''}! +

+

+ You just reached a new rank : ${object.rank_id.name} +

+

Continue your work to become a ${object.next_rank_id.name} !

+
+ % set gamification_redirection_data = object.get_gamification_redirection_data() + % for data in gamification_redirection_data + % set url = data['url'] + % set label = data['label'] + ${label} + % endfor
-
- Thank you,
-
- + 		+

+ +

+
+
 + ${object.lang} + + 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 @@ - Presence: Contact Employee + Employee: Absence email Unexpected Absence ${user.email_formatted | safe} 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 @@ Partner Mass Mail - ${object.id} + + ${object.lang} 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 @@ Sales Order: Send by email + ${object.company_id.name} ${object.state in ('draft', 'sent') and 'Quotation' or 'Order'} (Ref ${object.name or 'n/a' }) ${(object.user_id.email_formatted or user.email_formatted) | safe} ${object.partner_id.id} - ${object.company_id.name} ${object.state in ('draft', 'sent') and 'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })

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 @@ Your Coupon Code + ${object.partner_id.lang} - ${object.partner_id.lang} \ 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 @@ ${ctx['partner_id'].lang} + 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 @@ ${object.lang} + +