From a901d655504dd0afa5317e19c765aa68f23c9f7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Hennecart?= <jeh@odoo.com>
Date: Thu, 15 Apr 2021 14:15:44 +0000
Subject: [PATCH] [IMP] calendar: improve the quality of the calendar app

- Remove organisers filter from the sidebar

- Responsible becomes Organizer

Task ID 2196775
COM PR: odoo/odoo#55190
ENT PR: odoo/enterprise#12196
UPG PR: odoo/upgrade#1532

Co-authored-by: Simon Genin (ges) <ges@odoo.com>
Co-authored-by: jeh-odoo <jeh@odoo.com>
---
 addons/calendar/models/calendar_event.py |  4 ++--
 addons/calendar/views/calendar_views.xml | 13 ++++---------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/addons/calendar/models/calendar_event.py b/addons/calendar/models/calendar_event.py
index a13afdd3a7d..56ba6d1d2c6 100644
--- a/addons/calendar/models/calendar_event.py
+++ b/addons/calendar/models/calendar_event.py
@@ -97,9 +97,9 @@ class Meeting(models.Model):
     # description
     name = fields.Char('Meeting Subject', required=True)
     description = fields.Text('Description')
-    user_id = fields.Many2one('res.users', 'Responsible', default=lambda self: self.env.user)
+    user_id = fields.Many2one('res.users', 'Organizer', default=lambda self: self.env.user)
     partner_id = fields.Many2one(
-        'res.partner', string='Responsible Contact', related='user_id.partner_id', readonly=True)
+        'res.partner', string='Scheduled by', related='user_id.partner_id', readonly=True)
     location = fields.Char('Location', tracking=True, help="Location of Event")
     videocall_location = fields.Char('Join Video Call', default=_default_videocall_location)
     # visibility
diff --git a/addons/calendar/views/calendar_views.xml b/addons/calendar/views/calendar_views.xml
index 0ec4a0bac11..b539e1a021a 100644
--- a/addons/calendar/views/calendar_views.xml
+++ b/addons/calendar/views/calendar_views.xml
@@ -163,8 +163,9 @@
                                     <field name="alarm_ids" widget="many2many_tags" options="{'no_quick_create': True}"/>
                                     <field name="location" />
                                     <field name="categ_ids" widget="many2many_tags" options="{'color_field': 'color', 'no_create_edit': True}"/>
+                                    <field name="event_tz" attrs="{'invisible': [('recurrency', '=', False)]}"/>
+                                    <field name="user_id" widget="many2one_avatar_user"/>
                                 </group>
-
                             </group>
                             <label for="description"/>
                             <field name="description"/>
@@ -253,12 +254,6 @@
                                 </kanban>
                             </field>
                         </page>
-                        <page name="page_misc" string="Misc" groups="base.group_no_one">
-                            <group>
-                                <label for="user_id"/>
-                                <field name="user_id" nolabel="1" widget="many2one_avatar_user"/>
-                            </group>
-                        </page>
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
@@ -277,11 +272,11 @@
             <calendar js_class="attendee_calendar" string="Meetings" date_start="start" date_stop="stop" date_delay="duration" all_day="allday"
                 event_open_popup="true"
                 event_limit="5"
-                color="user_id">
+                color="partner_id">
                 <field name="location" attrs="{'invisible': [('location', '=', False)]}"/>
                 <field name="videocall_location" string="Join Video Call" widget="CopyClipboardURL" />
                 <field name="attendee_status" invisible="1"/>
-                <field name="user_id" string="Responsible" filters="1" widget="many2one_avatar_user"/>
+                <field name="partner_id" string="Organizer"/>
                 <field name="partner_ids" widget="many2manyattendee" write_model="calendar.contacts" write_field="partner_id" avatar_field="image_128"/>
                 <field name="is_highlighted" invisible="1"/>
                 <field name="description" attrs="{'invisible': [('description', '=', False)]}"/>