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/calendar/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/calendar/data')
| -rw-r--r-- | addons/calendar/data/mail_data.xml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/addons/calendar/data/mail_data.xml b/addons/calendar/data/mail_data.xml index a4e2fa46907..95940cd34c7 100644 --- a/addons/calendar/data/mail_data.xml +++ b/addons/calendar/data/mail_data.xml @@ -5,9 +5,9 @@ <field name="name">Calendar: Meeting Invitation</field> <field name="model_id" ref="calendar.model_calendar_attendee"/> <field name="subject">Invitation to ${object.event_id.name}</field> - <field name="email_from">${object.event_id.user_id.email or ''}</field> - <field name="email_to" >${('' if object.partner_id and object.partner_id.email and object.partner_id.email==object.email else object.email|safe)}</field> - <field name="partner_to">${object.partner_id and object.partner_id.email and object.partner_id.email==object.email and object.partner_id.id or False }</field> + <field name="email_from">${(object.event_id.user_id.email_formatted or user.email_formatted or '') | safe}</field> + <field name="email_to">${('' if object.partner_id.email and object.partner_id.email == object.email else object.email) | safe}</field> + <field name="partner_to">${object.partner_id.id if object.partner_id.email and object.partner_id.email == object.email else False}</field> <field name="body_html" type="html"> <div> % set colors = {'needsAction': 'grey', 'accepted': 'green', 'tentative': '#FFFF00', 'declined': 'red'} @@ -88,9 +88,9 @@ <field name="name">Calendar: Date updated</field> <field name="model_id" ref="calendar.model_calendar_attendee"/> <field name="subject">${object.event_id.name}: Date updated</field> - <field name="email_from">${object.event_id.user_id.email or ''}</field> - <field name="email_to" >${('' if object.partner_id and object.partner_id.email and object.partner_id.email==object.email else object.email|safe)}</field> - <field name="partner_to">${object.partner_id and object.partner_id.email and object.partner_id.email==object.email and object.partner_id.id or False }</field> + <field name="email_from">${(object.event_id.user_id.email_formatted or user.email_formatted or '') | safe}</field> + <field name="email_to">${('' if object.partner_id.email and object.partner_id.email == object.email else object.email) | safe}</field> + <field name="partner_to">${object.partner_id.id if object.partner_id.email and object.partner_id.email == object.email else False}</field> <field name="body_html" type="html"> <div> % set colors = {'needsAction': 'grey', 'accepted': 'green', 'tentative': '#FFFF00', 'declined': 'red'} @@ -171,9 +171,9 @@ <field name="name">Calendar: Reminder</field> <field name="model_id" ref="calendar.model_calendar_attendee"/> <field name="subject">${object.event_id.name} - Reminder</field> - <field name="email_from">${object.event_id.user_id.email or ''}</field> - <field name="email_to" >${('' if object.partner_id and object.partner_id.email and object.partner_id.email==object.email else object.email|safe)}</field> - <field name="partner_to">${object.partner_id and object.partner_id.email and object.partner_id.email==object.email and object.partner_id.id or False }</field> + <field name="email_from">${(object.event_id.user_id.email_formatted or user.email_formatted or '') | safe}</field> + <field name="email_to">${('' if object.partner_id.email and object.partner_id.email == object.email else object.email) | safe}</field> + <field name="partner_to">${object.partner_id.id if object.partner_id.email and object.partner_id.email == object.email else False}</field> <field name="body_html" type="html"> <div> % set colors = {'needsAction': 'grey', 'accepted': 'green', 'tentative': '#FFFF00', 'declined': 'red'} |