diff options
| author | Thibault Delavallée <tde@odoo.com> | 2019-04-23 12:29:35 +0000 |
|---|---|---|
| committer | Thibault Delavallée <tde@odoo.com> | 2019-04-23 14:26:50 +0000 |
| commit | 0b74c9ab6e2e190d3c3aed1a1c075cec36a1ad94 (patch) | |
| tree | 08ae6efc2f1ab5b835ca0eafc437737d821b19f0 /addons/auth_signup/data/auth_signup_data.xml | |
| parent | 25c2c5e01209b57ce5e4213d2856a98a0251d0b8 (diff) | |
[FIX][IMP] various: improve recipients computation in mail templates
Purpose: use more email_formatted when possible, clean and simplify
email_from, email_to and partner_to computation.
Next step is to try to extract some common patterns in tools or methods in
order to simplify template creation and customization.
Related to task 1972615
Linked to PR #32872
Diffstat (limited to 'addons/auth_signup/data/auth_signup_data.xml')
| -rw-r--r-- | addons/auth_signup/data/auth_signup_data.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/auth_signup/data/auth_signup_data.xml b/addons/auth_signup/data/auth_signup_data.xml index 6db81fd0dc3..f035cdc8b81 100644 --- a/addons/auth_signup/data/auth_signup_data.xml +++ b/addons/auth_signup/data/auth_signup_data.xml @@ -8,7 +8,7 @@ <field name="name">Auth Signup: Reset Password</field> <field name="model_id" ref="base.model_res_users"/> <field name="subject">Password reset</field> - <field name="email_from">${('"%s" <%s>' % (object.company_id.name, object.company_id.email or user.email))|safe}</field> + <field name="email_from">"${object.company_id.name | safe}" <${(object.company_id.email or user.email) | safe}></field> <field name="email_to">${object.email_formatted | safe}</field> <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"> @@ -101,7 +101,7 @@ <field name="name">Auth Signup: Odoo Connection</field> <field name="model_id" ref="base.model_res_users"/> <field name="subject">${object.create_uid.name} from ${object.company_id.name} invites you to connect to Odoo</field> - <field name="email_from">"${object.company_id.name|safe}" <${object.company_id.email or user.email|safe}></field> + <field name="email_from">"${object.company_id.name | safe}" <${(object.company_id.email or user.email) | safe}></field> <field name="email_to">${object.email_formatted | safe}</field> <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"> @@ -198,7 +198,7 @@ <field name="name">Auth Signup: Odoo Account Created</field> <field name="model_id" ref="base.model_res_users"/> <field name="subject">Welcome to ${object.company_id.name}!</field> - <field name="email_from">"${object.company_id.name|safe}" <${(object.company_id.email or user.email)|safe}></field> + <field name="email_from">"${object.company_id.name | safe}" <${(object.company_id.email or user.email) | safe}></field> <field name="email_to">${object.email_formatted | safe}</field> <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"> |