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 | |
| 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')
19 files changed, 39 insertions, 38 deletions
diff --git a/addons/account/data/mail_template_data.xml b/addons/account/data/mail_template_data.xml index d5f4482e4a9..f384d3f49cc 100644 --- a/addons/account/data/mail_template_data.xml +++ b/addons/account/data/mail_template_data.xml @@ -8,7 +8,7 @@ <record id="email_template_edi_invoice" model="mail.template"> <field name="name">Invoice: Send by email</field> <field name="model_id" ref="account.model_account_invoice"/> - <field name="email_from">${object.user_id.email_formatted |safe}</field> + <field name="email_from">${(object.user_id.email_formatted or user.email_formatted) |safe}</field> <field name="partner_to">${object.partner_id.id}</field> <field name="subject">${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})</field> <field name="body_html" type="html"> 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"> 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'} diff --git a/addons/digest/data/digest_template_data.xml b/addons/digest/data/digest_template_data.xml index e3053b661d1..aebf9ac0242 100644 --- a/addons/digest/data/digest_template_data.xml +++ b/addons/digest/data/digest_template_data.xml @@ -4,7 +4,7 @@ <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}</field> + <field name="email_from">${user.email_formatted | safe}</field> <field name="lang">${user.lang}</field> <field name="body_html"><![CDATA[ <table style="width: 100%; border-spacing: 0; font-family: Helvetica,Arial,Verdana,sans-serif;"> 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"> diff --git a/addons/gamification/data/goal_base.xml b/addons/gamification/data/goal_base.xml index e26a64765f0..ca1061b6d24 100644 --- a/addons/gamification/data/goal_base.xml +++ b/addons/gamification/data/goal_base.xml @@ -5,9 +5,10 @@ <!--Email template --> <record id="email_template_goal_reminder" model="mail.template"> - <field name="name">Reminder for Goal Update</field> + <field name="name">Goal: Reminder for Goal Update</field> <field name="model_id" ref="gamification.model_gamification_goal"/> <field name="lang">${object.user_id.lang}</field> + <field name="partner_to">${object.user_id.partner_id.id}</field> <field name="body_html" type="html"> <div> <strong>Reminder ${object.name}</strong><br/> diff --git a/addons/hr/data/hr_data.xml b/addons/hr/data/hr_data.xml index 869a74a8350..ab7165fee25 100644 --- a/addons/hr/data/hr_data.xml +++ b/addons/hr/data/hr_data.xml @@ -64,7 +64,7 @@ <field name="name">HR: mailgateway unknown employee bounce</field> <field name="model_id" ref="base.model_ir_module_module"/> <field name="subject">Your document has not been created</field> - <field name="email_from">${user.email}</field> + <field name="email_from">${user.email_formatted | safe}</field> <field name="email_to">${ctx['email_to']|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"> diff --git a/addons/hr_presence/data/mail_data.xml b/addons/hr_presence/data/mail_data.xml index f2ab1ca0579..8b5485d46ab 100644 --- a/addons/hr_presence/data/mail_data.xml +++ b/addons/hr_presence/data/mail_data.xml @@ -5,8 +5,8 @@ <field name="name">Presence: Contact Employee</field> <field name="model_id" ref="hr.model_hr_employee"/> <field name="subject">Unexpected Absence</field> - <field name="email_from">${ctx['email_from'] or ''}</field> - <field name="email_to">${ctx['email_to'] or ''}</field> + <field name="email_from">${user.email_formatted | safe}</field> + <field name="email_to">${(object.user_id.email_formatted or object.work_email) | safe}</field> <field name="auto_delete" eval="False"/> <field name="body_html" type="xml"> <div> diff --git a/addons/hr_presence/models/hr_employee.py b/addons/hr_presence/models/hr_employee.py index a37050fd51f..0fedc553c86 100644 --- a/addons/hr_presence/models/hr_employee.py +++ b/addons/hr_presence/models/hr_employee.py @@ -160,8 +160,6 @@ Do not hesitate to contact your manager or the human resource department.""") default_composition_mode='comment', default_is_log=True, custom_layout='mail.mail_notification_light', - email_from=self.env.user.email, - email_to=self.work_email, ) return { 'name': _('Compose Email'), diff --git a/addons/project/data/project_mail_template_data.xml b/addons/project/data/project_mail_template_data.xml index b274e5935c9..f590d34ed65 100644 --- a/addons/project/data/project_mail_template_data.xml +++ b/addons/project/data/project_mail_template_data.xml @@ -26,7 +26,7 @@ <field name="name">Task: Rating Request</field> <field name="model_id" ref="project.model_project_task"/> <field name="subject">${object.project_id.company_id.name}: Satisfaction Survey</field> - <field name="email_from">${('"%s" <%s>' % (object.rating_get_rated_partner_id().name, object.rating_get_rated_partner_id().email) if object.rating_get_rated_partner_id().email else '') | safe}</field> + <field name="email_from">${(object.rating_get_rated_partner_id().email_formatted if object.rating_get_rated_partner_id() else user.email_formatted) | safe}</field> <field name="partner_to" >${object.rating_get_partner_id().id}</field> <field name="body_html" type="html"> <div> diff --git a/addons/repair/data/repair_data.xml b/addons/repair/data/repair_data.xml index 136a20d0c82..8a7fc9ac178 100644 --- a/addons/repair/data/repair_data.xml +++ b/addons/repair/data/repair_data.xml @@ -5,7 +5,7 @@ <field name="name">Repair Quotation: Send by email</field> <field name="model_id" ref="repair.model_repair_order"/> <field name="subject">${object.partner_id.name} Repair Orders (Ref ${object.name or 'n/a' })</field> - <field name="email_from">${(object.create_uid.email and '%s <%s>' % (object.create_uid.name, object.create_uid.email) or '')|safe}</field> + <field name="email_from">${(object.create_uid.email_formatted or user.email_formatted) | safe}</field> <field name="partner_to">${object.partner_id.id}</field> <field name="body_html" type="xml"> <div style="margin: 0px; padding: 0px;"> diff --git a/addons/sale/data/mail_data.xml b/addons/sale/data/mail_data.xml index 53a5914add3..8c18eda4358 100644 --- a/addons/sale/data/mail_data.xml +++ b/addons/sale/data/mail_data.xml @@ -73,7 +73,7 @@ <record id="email_template_edi_sale" model="mail.template"> <field name="name">Sales Order: Send by email</field> <field name="model_id" ref="sale.model_sale_order"/> - <field name="email_from">${object.user_id.email_formatted |safe}</field> + <field name="email_from">${(object.user_id.email_formatted or user.email_formatted) | safe}</field> <field name="partner_to">${object.partner_id.id}</field> <field name="subject">${object.company_id.name} ${object.state in ('draft', 'sent') and 'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })</field> <field name="body_html" type="html"> diff --git a/addons/sale_coupon/data/sale_coupon_email_data.xml b/addons/sale_coupon/data/sale_coupon_email_data.xml index 53857c9f4f4..045265e1f71 100644 --- a/addons/sale_coupon/data/sale_coupon_email_data.xml +++ b/addons/sale_coupon/data/sale_coupon_email_data.xml @@ -5,7 +5,7 @@ <field name="name">Coupon: Send by Email</field> <field name="model_id" ref="sale_coupon.model_sale_coupon"/> <field name="subject">Your reward coupon from ${object.program_id.company_id.name} </field> - <field name="email_from">${object.program_id.company_id.email|safe}</field> + <field name="email_from">${object.program_id.company_id.email | safe}</field> <field name="partner_to">${object.partner_id.id}</field> <field name="body_html" type="html"> <table border="0" cellpadding="0" cellspacing="0" style="width:100%; margin:0px auto;"><tbody> diff --git a/addons/survey/data/mail_template_data.xml b/addons/survey/data/mail_template_data.xml index 94bc68b6016..5e2fca9ed0c 100644 --- a/addons/survey/data/mail_template_data.xml +++ b/addons/survey/data/mail_template_data.xml @@ -5,6 +5,7 @@ <field name="name">Survey: Send by email</field> <field name="model_id" ref="model_survey_user_input" /> <field name="subject">Participate to ${object.survey_id.title} survey</field> + <field name="email_to">${(object.partner_id.email_formatted or object.email) |safe}</field> <field name="body_html" type="html"> <div style="margin: 0px; padding: 0px; font-size: 13px;"> <p style="margin: 0px; padding: 0px; font-size: 13px;"> @@ -39,8 +40,8 @@ <record id="mail_template_certification" model="mail.template"> <field name="name">Certification: Send by email</field> <field name="model_id" ref="survey.model_survey_user_input"/> - <field name="email_to">${(object.partner_id.email_formatted or object.email) |safe}</field> <field name="subject">Certification: ${object.survey_id.display_name}</field> + <field name="email_to">${(object.partner_id.email_formatted or object.email) |safe}</field> <field name="report_template" ref="certification_report"/> <field name="report_name">Certification Document</field> <field name="lang">${object.partner_id.lang}</field> 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 84d8daab36d..4716b762575 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 @@ -17,8 +17,8 @@ <field name="name">Lead Forward: Send to partner</field> <field name="model_id" ref="website_crm_partner_assign.model_crm_lead_forward_to_partner" /> <field name="subject">Fwd: Lead: ${ctx['partner_id'].name}</field> - <field name="email_from">${(user.email or '')|safe}</field> - <field name="email_to">${ctx['partner_id'].email|safe}</field> + <field name="email_from">${user.email_formatted | safe}</field> + <field name="email_to">${ctx['partner_id'].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"> <table border="0" cellpadding="0" cellspacing="0" width="590" style="padding: 16px; background-color: white; color: #454748; border-collapse:separate;"> diff --git a/addons/website_profile/data/profile_data.xml b/addons/website_profile/data/profile_data.xml index 5331fa23e8e..119f613af6c 100644 --- a/addons/website_profile/data/profile_data.xml +++ b/addons/website_profile/data/profile_data.xml @@ -7,8 +7,8 @@ <field name="name">Profile: Email Verification</field> <field name="model_id" ref="base.model_res_users"/> <field name="subject">${object.company_id.name} Profile validation</field> - <field name="email_from">${('<%s>' % (object.env.user.company_id.email or user.email)) | safe}</field> - <field name="email_to">${object.email|safe}</field> + <field name="email_from">${user.email_formatted | 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; color: #454748; width: 100%; border-collapse:separate;"><tr><td align="center"> <table border="0" cellpadding="0" cellspacing="0" width="590" style="padding: 16px; background-color: white; color: #454748; border-collapse:separate;"> diff --git a/addons/website_sale/data/mail_template_data.xml b/addons/website_sale/data/mail_template_data.xml index fd94cb52c82..e342812712f 100644 --- a/addons/website_sale/data/mail_template_data.xml +++ b/addons/website_sale/data/mail_template_data.xml @@ -5,7 +5,7 @@ <field name="name">Sale Order: Cart Recovery Email</field> <field name="model_id" ref="sale.model_sale_order"/> <field name="subject">You left items in your cart!</field> - <field name="email_from">${(object.user_id.email or '')|safe}</field> + <field name="email_from">${(object.user_id.email_formatted or user.email_formatted or '') | safe}</field> <field name="partner_to">${object.partner_id.id}</field> <field name="body_html" type="xml"> <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"> diff --git a/addons/website_slides/data/mail_data.xml b/addons/website_slides/data/mail_data.xml index 3b397545940..7913374723e 100644 --- a/addons/website_slides/data/mail_data.xml +++ b/addons/website_slides/data/mail_data.xml @@ -30,7 +30,7 @@ <field name="name">Slide Shared</field> <field name="model_id" ref="model_slide_slide"/> <field name="subject">${user.name} shared a ${object.slide_type} with you!</field> - <field name="email_from">${(user.email or '')|safe}</field> + <field name="email_from">${user.email_formatted | safe}</field> <field name="email_to">${ctx['email']}</field> <field name="body_html" type="html"> <div style="margin: 0px; padding: 0px;"> @@ -66,6 +66,7 @@ <field name="name">Channel: Invite by email</field> <field name="model_id" ref="model_slide_channel_partner" /> <field name="subject">You have been invited to join ${object.channel_id.name}</field> + <field name="use_default_to" eval="True"/> <field name="body_html" type="html"> <div style="margin: 0px; padding: 0px; font-size: 13px;"> <p style="margin: 0px; padding: 0px; font-size: 13px;"> diff --git a/addons/website_slides_survey/data/mail_template_data.xml b/addons/website_slides_survey/data/mail_template_data.xml index d9c2c90b870..d423412f296 100644 --- a/addons/website_slides_survey/data/mail_template_data.xml +++ b/addons/website_slides_survey/data/mail_template_data.xml @@ -4,8 +4,8 @@ <record id="mail_template_user_input_certification_failed" model="mail.template"> <field name="name">Certification failed email</field> <field name="model_id" ref="model_survey_user_input" /> - <field name="partner_to">${object.partner_id.id}</field> <field name="subject">You have failed the course: ${object.slide_partner_id.channel_id.name}</field> + <field name="partner_to">${object.partner_id.id}</field> <field name="body_html" type="html"> <div style="margin: 0px; padding: 0px; font-size: 13px;"> <p style="margin: 0px; padding: 0px; font-size: 13px;"> |