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/event/data | |
| 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/event/data')
| -rw-r--r-- | addons/event/data/email_template_data.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/addons/event/data/email_template_data.xml b/addons/event/data/email_template_data.xml index d78d4c27de4..004242a54e7 100644 --- a/addons/event/data/email_template_data.xml +++ b/addons/event/data/email_template_data.xml @@ -6,8 +6,8 @@ <field name="name">Event: Registration Badge</field> <field name="model_id" ref="event.model_event_registration"/> <field name="subject">Your badge for ${object.event_id.name}</field> - <field name="email_from">${(object.event_id.organizer_id.email or object.event_id.user_id.email or '')|safe}</field> - <field name="email_to">${('"%s" <%s>' % (object.partner_id.name or object.name, object.partner_id.email or object.email)) | safe}</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" <%s>' % (object.name, object.email) or '') | safe}</field> <field name="body_html" type="html"> <div> Dear ${object.name},<br/> @@ -30,8 +30,8 @@ <field name="name">Event: Registration</field> <field name="model_id" ref="event.model_event_registration"/> <field name="subject">Your registration at ${object.event_id.name}</field> - <field name="email_from">${(object.event_id.organizer_id.email or object.event_id.user_id.email or '')|safe}</field> - <field name="email_to">${('"%s" <%s>' % (object.partner_id.name or object.name, object.partner_id.email or object.email)) | safe}</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" <%s>' % (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"> @@ -227,8 +227,8 @@ <field name="name">Event: Reminder</field> <field name="model_id" ref="event.model_event_registration"/> <field name="subject">${object.event_id.name}: ${object.get_date_range_str()}</field> - <field name="email_from">${(object.event_id.organizer_id.email or object.event_id.user_id.email or '')|safe}</field> - <field name="email_to">${('"%s" <%s>' % (object.partner_id.name or object.name, object.partner_id.email or object.email)) | safe}</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" <%s>' % (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"> |