From 32c1c5ab1b2c98aad75acfe432cb91c5b1048dc1 Mon Sep 17 00:00:00 2001
From: Jairo Llopis <yajo.sk8@gmail.com>
Date: Thu, 22 Aug 2019 08:19:36 +0000
Subject: [PATCH] [FIX] website_event_track: rename Partner to Speaker and
 remove duplicated fields

Before this patch, the word "Partner" wasn't specific enough to make the user
know that it was referring to the speaker. This was OK in the form, bug i.e.
in the calendar view it's very confusing.

This change comes from 1e61522d198c1f98db8fb8d9ca531659f057bf9a and we revert back to Speaker labelling.

Also, in the form view, the partner field was duplicated, contributing even
more to the confusion. It probably comes from c058562d7301298fd71b2618b5386611dfeb81cb that duplicated the field
probably because of a bad conflict resolution.

Now partner is labelled Speaker and multi company domain is correctly taken
into account.

closes odoo/odoo#37781

Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
---
 addons/website_event_track/models/event_track.py       | 2 +-
 addons/website_event_track/views/event_track_views.xml | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/website_event_track/models/event_track.py b/addons/website_event_track/models/event_track.py
index cdef06a5be8..80bf005d11a 100644
--- a/addons/website_event_track/models/event_track.py
+++ b/addons/website_event_track/models/event_track.py
@@ -60,7 +60,7 @@ class Track(models.Model):
     active = fields.Boolean(default=True)
     user_id = fields.Many2one('res.users', 'Responsible', tracking=True, default=lambda self: self.env.user)
     company_id = fields.Many2one('res.company', related='event_id.company_id')
-    partner_id = fields.Many2one('res.partner', 'Partner')
+    partner_id = fields.Many2one('res.partner', 'Speaker')
     partner_name = fields.Char('Name')
     partner_email = fields.Char('Email')
     partner_phone = fields.Char('Phone')
diff --git a/addons/website_event_track/views/event_track_views.xml b/addons/website_event_track/views/event_track_views.xml
index 3bb5605052c..cd93919b11d 100644
--- a/addons/website_event_track/views/event_track_views.xml
+++ b/addons/website_event_track/views/event_track_views.xml
@@ -82,7 +82,7 @@
                     <field name="stage_id"/>
                     <field name="partner_id"/>
                     <filter string="My Tracks" name="my_tracks" domain="[('user_id', '=', uid)]"/>
-                    <separator/>    
+                    <separator/>
                     <filter string="Unread Messages" name="message_needaction" domain="[('message_needaction', '=', True)]"/>
                     <separator/>
                     <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
@@ -141,7 +141,6 @@
                             <group>
                                 <field name="company_id" invisible="1"/>
                                 <field name="user_id"/>
-                                <field name="partner_id" domain="['|', ('company_id', '=', company_id), ('company_id', '=', False)]"/>
                                 <field name="event_id"/>
                                 <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}"/>
                             </group>
@@ -149,7 +148,7 @@
                         <notebook>
                             <page string="Speakers">
                                 <group>
-                                    <field name="partner_id"/>
+                                    <field name="partner_id" domain="['|', ('company_id', '=', company_id), ('company_id', '=', False)]"/>
                                     <field name="partner_name"/>
                                     <field name="partner_email"/>
                                     <field name="partner_phone"/>