From 350701bf3d7d4298a2b2dc0e82935393595ae294 Mon Sep 17 00:00:00 2001
From: david <david.vidal@tecnativa.com>
Date: Wed, 2 Oct 2019 12:01:51 +0000
Subject: [PATCH] [FIX] event: notify to attendee information because its
 partner by default

Indeed when buying tickets for an event several registrations could be
linked to the same partner while having different information for email
and name on registrations themselves.

Let us therefore format the automated emails first to registration info
if present and fallback on partner.

closes odoo/odoo#37790

Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
---
 addons/event/data/email_template_data.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/event/data/email_template_data.xml b/addons/event/data/email_template_data.xml
index c0b3ece2d08..46df2ffb194 100644
--- a/addons/event/data/email_template_data.xml
+++ b/addons/event/data/email_template_data.xml
@@ -7,7 +7,7 @@
             <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_formatted or object.event_id.user_id.email_formatted or '') | safe}</field>
-            <field name="email_to">${(object.partner_id.email_formatted or '"%s" &lt;%s&gt;' % (object.name, object.email) or '') | safe}</field>
+            <field name="email_to">${(object.email and '"%s" &lt;%s&gt;' % (object.name, object.email) or object.partner_id.email_formatted or '') | safe}</field>
             <field name="body_html" type="html">
 <div>
     Dear ${object.name},<br/>
@@ -32,7 +32,7 @@
             <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_formatted or object.event_id.user_id.email_formatted or '') | safe}</field>
-            <field name="email_to">${(object.partner_id.email_formatted or '"%s" &lt;%s&gt;' % (object.name, object.email) or '') | safe}</field>
+            <field name="email_to">${(object.email and '"%s" &lt;%s&gt;' % (object.name, object.email) or object.partner_id.email_formatted or '') | 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">
 % set date_begin = format_datetime(object.event_id.date_begin, tz='UTC', dt_format='%Y%m%dT%H%M%SZ')
@@ -229,7 +229,7 @@
             <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_formatted or object.event_id.user_id.email_formatted or '') | safe}</field>
-            <field name="email_to">${(object.partner_id.email_formatted or '"%s" &lt;%s&gt;' % (object.name, object.email) or '') | safe}</field>
+            <field name="email_to">${(object.email and '"%s" &lt;%s&gt;' % (object.name, object.email) or object.partner_id.email_formatted or '') | 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">
 % set date_begin = format_datetime(object.event_id.date_begin, tz='UTC', dt_format='%Y%m%dT%H%M%SZ')