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/digest/data/digest_template_data.xml | |
| 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/digest/data/digest_template_data.xml')
| -rw-r--r-- | addons/digest/data/digest_template_data.xml | 23 |
1 files changed, 12 insertions, 11 deletions
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 @@ <record id="digest_mail_template" model="mail.template"> <field name="name">Digest: Default main template</field> <field name="model_id" ref="digest.model_digest_digest"/> - <field name="auto_delete" eval="True" /> <field name="email_from">${user.email_formatted | safe}</field> - <field name="lang">${user.lang}</field> - <field name="body_html"><![CDATA[ + <field name="subject">${'%s: %s' % (ctx.get('user', user).company_id.name, object.name)}</field> + <field name="body_html" type="html"> <table style="width: 100%; border-spacing: 0; font-family: Helvetica,Arial,Verdana,sans-serif;"> <tr> <td align="center" valign="top" style="border-collapse: collapse; padding: 0"> @@ -54,10 +53,10 @@ <span style="color: #888888; display: inline-block; font-size: 12px; line-height: 18px; text-transform: uppercase;">Yesterday</span> % if data['yesterday'][kpi]['margin'] != 0.0: <span style="color: #888888; display: block; font-size: 12px; line-height: 18px; text-transform: uppercase;"> - % if data['yesterday'][kpi]['margin'] > 0.0: + % if data['yesterday'][kpi]['margin'] > 0.0: <span style="color: #0bbc22;">▲</span>${"%.2f" % data['yesterday'][kpi]['margin']} % % endif - % if data['yesterday'][kpi]['margin'] < 0.0: + % if data['yesterday'][kpi]['margin'] < 0.0: <span style="color: #ff0000;">▼</span>${"%.2f" % data['yesterday'][kpi]['margin']} % % endif </span> @@ -74,10 +73,10 @@ <span style="color: #888888; display: inline-block; font-size: 12px; line-height: 18px; text-transform: uppercase;">Last 7 Days</span> % if data['lastweek'][kpi]['margin'] != 0.0: <span style="color: #888888; display: block; font-size: 12px; line-height: 18px; text-transform: uppercase;"> - % if data['lastweek'][kpi]['margin'] > 0.0: + % if data['lastweek'][kpi]['margin'] > 0.0: <span style="color: #0bbc22;">▲</span>${"%.2f" % data['lastweek'][kpi]['margin']} % % endif - % if data['lastweek'][kpi]['margin'] < 0.0: + % if data['lastweek'][kpi]['margin'] <0.0: <span style="color: #ff0000;">▼</span>${"%.2f" % data['lastweek'][kpi]['margin']} % %endif </span> @@ -94,10 +93,10 @@ <span style="color: #888888; display: inline-block; font-size: 12px; line-height: 18px; text-transform: uppercase;">Last 30 Days</span> % if data['lastmonth'][kpi]['margin'] != 0.0: <span style="color: #888888; display: block; font-size: 12px; line-height: 18px; text-transform: uppercase;"> - % if data['lastmonth'][kpi]['margin'] > 0.0: + % if data['lastmonth'][kpi]['margin'] > 0.0: <span style="color: #0bbc22;">▲</span>${"%.2f" % data['lastmonth'][kpi]['margin']} % % endif - % if data['lastmonth'][kpi]['margin'] < 0.0: + % if data['lastmonth'][kpi]['margin'] < 0.0: <span style="color: #ff0000;">▼</span>${"%.2f" % data['lastmonth'][kpi]['margin']} % %endif </span> @@ -155,7 +154,9 @@ </table> </td> </tr> -</table> - ]]></field> +</table></field> + <field name="lang">${user.lang}</field> + <field name="auto_delete" eval="True"/> + <field name="user_signature" eval="False"/> </record> </odoo> |