[IMP] calendar: Adapt views and test for new color and filters

closes odoo/odoo#41573

Taskid: 2153249
Related: odoo/enterprise#7157
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>

18 files changed, 28 insertions, 13 deletions

diff --git a/addons/calendar/views/calendar_views.xml b/addons/calendar/views/calendar_views.xml
index d15b7f6f356..0566e4973fb 100644
--- a/addons/calendar/views/calendar_views.xml
+++ b/addons/calendar/views/calendar_views.xml
@@ -263,7 +263,7 @@
                 event_limit="5"
                 color="partner_id">
                 <field name="attendee_status"/>
-                <field name="partner_id" filter="1"/>
+                <field name="partner_id" filters="1"/>
                 <field name="partner_ids" widget="many2many_tags_avatar" write_model="calendar.contacts" write_field="partner_id" avatar_field="image_128"/>
                 <field name="is_highlighted" invisible="1"/>
                 <field name="description"/>
diff --git a/addons/crm/views/crm_lead_views.xml b/addons/crm/views/crm_lead_views.xml
index 53a0ea56667..bdb2cbaf82c 100644
--- a/addons/crm/views/crm_lead_views.xml
+++ b/addons/crm/views/crm_lead_views.xml
@@ -396,6 +396,7 @@
                 <calendar string="Leads Generation" create="0" mode="month" date_start="activity_date_deadline" color="user_id" hide_time="true" event_limit="5">
                     <field name="planned_revenue"/>
                     <field name="partner_id" avatar_field="image_128"/>
+                    <field name="user_id" filters="1" invisible="1"/>
                 </calendar>
             </field>
         </record>
diff --git a/addons/event/views/event_views.xml b/addons/event/views/event_views.xml
index c1f93eda3d9..62acfb7bba0 100644
--- a/addons/event/views/event_views.xml
+++ b/addons/event/views/event_views.xml
@@ -402,6 +402,7 @@
                     <field name="seats_reserved"/>
                     <field name="seats_used"/>
                     <field name="seats_unconfirmed"/>
+                    <field name="event_type_id" filters="1" invisible="1"/>
                 </calendar>
             </field>
         </record>
@@ -589,7 +590,7 @@
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <calendar date_start="event_begin_date" date_stop="event_end_date" string="Event Registration" color="event_id" event_limit="5">
-                    <field name="event_id"/>
+                    <field name="event_id" filters="1"/>
                     <field name="name"/>
                 </calendar>
             </field>
diff --git a/addons/hr_holidays/views/hr_leave_views.xml b/addons/hr_holidays/views/hr_leave_views.xml
index f39b9a635fc..1286fa6e3fc 100644
--- a/addons/hr_holidays/views/hr_leave_views.xml
+++ b/addons/hr_holidays/views/hr_leave_views.xml
@@ -358,6 +358,7 @@
         <field name="arch" type="xml">
             <calendar js_class="time_off_calendar" string="Time Off Request" form_view_id="%(hr_holidays.hr_leave_view_form_dashboard)d" event_open_popup="true" date_start="date_from" date_stop="date_to" mode="month" quick_add="False" show_unusual_days="True" color="employee_id" hide_time="True">
                 <field name="display_name"/>
+                <field name="employee_id" filters="1" invisible="1"/>
             </calendar>
         </field>
     </record>
@@ -418,6 +419,7 @@
         <field name="arch" type="xml">
             <calendar string="Time Off Request" event_open_popup="true" date_start="date_from" date_stop="date_to" mode="month" quick_add="False" color="employee_id">
                 <field name="display_name"/>
+                <field name="employee_id" filters="1" invisible="1"/>
             </calendar>
         </field>
     </record>
diff --git a/addons/hr_recruitment/views/hr_recruitment_views.xml b/addons/hr_recruitment/views/hr_recruitment_views.xml
index ea11d7f5e0e..bbd6f3e44be 100644
--- a/addons/hr_recruitment/views/hr_recruitment_views.xml
+++ b/addons/hr_recruitment/views/hr_recruitment_views.xml
@@ -233,6 +233,7 @@
                 <field name="job_id"/>
                 <field name="priority" widget="priority"/>
                 <field name="activity_summary"/>
+                <field name="user_id" filters="1" invisible="1"/>
             </calendar>
         </field>
     </record>
diff --git a/addons/mail/views/mail_activity_views.xml b/addons/mail/views/mail_activity_views.xml
index 6ffc0333fd2..713f9873e38 100644
--- a/addons/mail/views/mail_activity_views.xml
+++ b/addons/mail/views/mail_activity_views.xml
@@ -213,6 +213,7 @@
                 <field name="res_name"/>
                 <field name="date_deadline"/>
                 <field name="summary"/>
+                <field name="activity_type_id" filters="1" invisible="1"/>
             </calendar>
         </field>
     </record>
diff --git a/addons/maintenance/views/maintenance_views.xml b/addons/maintenance/views/maintenance_views.xml
index 86209c2d090..df19260ab44 100644
--- a/addons/maintenance/views/maintenance_views.xml
+++ b/addons/maintenance/views/maintenance_views.xml
@@ -223,7 +223,7 @@
         <field name="model">maintenance.request</field>
         <field name="arch" type="xml">
             <calendar date_start="schedule_date" date_delay="duration" color="user_id" event_limit="5">
-                <field name="user_id"/>
+                <field name="user_id" filters="1"/>
                 <field name="priority"/>
                 <field name="maintenance_type"/>
             </calendar>
diff --git a/addons/mrp/views/mrp_production_views.xml b/addons/mrp/views/mrp_production_views.xml
index c32f0fb5e00..75c140d8d4b 100644
--- a/addons/mrp/views/mrp_production_views.xml
+++ b/addons/mrp/views/mrp_production_views.xml
@@ -272,7 +272,7 @@
             <field name="arch" type="xml">
                 <calendar date_start="date_planned_start" date_stop="date_planned_finished"
                           string="Manufacturing Orders" color="routing_id" event_limit="5" quick_add="False">
-                    <field name="routing_id"/>
+                    <field name="routing_id" filters="1"/>
                     <field name="user_id" avatar_field="image_128"/>
                     <field name="product_id"/>
                     <field name="product_qty"/>
diff --git a/addons/mrp/views/mrp_workorder_views.xml b/addons/mrp/views/mrp_workorder_views.xml
index fc9b34416bd..68a30400e77 100644
--- a/addons/mrp/views/mrp_workorder_views.xml
+++ b/addons/mrp/views/mrp_workorder_views.xml
@@ -308,7 +308,7 @@
         <field name="model">mrp.workorder</field>
         <field name="arch" type="xml">
             <calendar date_stop="date_planned_finished" date_start="date_planned_start" string="Operations" color="workcenter_id" event_limit="5">
-                <field name="workcenter_id"/>
+                <field name="workcenter_id" filters="1"/>
                 <field name="production_id"/>
                 <field name="state"/>
             </calendar>
diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml
index ca3522ebdb6..9346f0de6e4 100644
--- a/addons/project/views/project_views.xml
+++ b/addons/project/views/project_views.xml
@@ -719,7 +719,7 @@
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <calendar date_start="date_deadline" string="Tasks" mode="month" color="user_id" event_limit="5" hide_time="true">
-                    <field name="user_id" avatar_field="image_128"/>
+                    <field name="user_id" avatar_field="image_128" filters="1"/>
                     <field name="date_deadline"/>
                     <field name="project_id"/>
                     <field name="priority" widget="priority"/>
diff --git a/addons/purchase/views/purchase_views.xml b/addons/purchase/views/purchase_views.xml
index e95da67a081..13a7069e26f 100644
--- a/addons/purchase/views/purchase_views.xml
+++ b/addons/purchase/views/purchase_views.xml
@@ -91,7 +91,7 @@
                     <field name="name"/>
                     <field name="partner_ref"/>
                     <field name="amount_total" widget="monetary"/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" filters="1"/>
                 </calendar>
             </field>
         </record>
diff --git a/addons/resource/views/resource_views.xml b/addons/resource/views/resource_views.xml
index 94252e3e05e..48737755e10 100644
--- a/addons/resource/views/resource_views.xml
+++ b/addons/resource/views/resource_views.xml
@@ -107,7 +107,7 @@
         <field name="model">resource.calendar.leaves</field>
         <field name="arch" type="xml">
             <calendar date_start="date_from" date_stop="date_to" mode="month" string="Resource" color="resource_id" event_limit="5">
-                <field name="resource_id" avatar_field="image_128"/>
+                <field name="resource_id" avatar_field="image_128" filters="1"/>
                 <field name="company_id"/>
                 <field name="name"/>
             </calendar>
diff --git a/addons/sale/views/sale_views.xml b/addons/sale/views/sale_views.xml
index cf8d5e42234..b0c60de581c 100644
--- a/addons/sale/views/sale_views.xml
+++ b/addons/sale/views/sale_views.xml
@@ -118,6 +118,7 @@
                     <field name="partner_id" avatar_field="image_128"/>
                     <field name="amount_total" widget="monetary"/>
                     <field name="payment_term_id"/>
+                    <field name="state" filters="1" invisible="1"/>
                 </calendar>
             </field>
         </record>
diff --git a/addons/stock/views/stock_picking_views.xml b/addons/stock/views/stock_picking_views.xml
index d7f869fdd01..49b7c1f6bb4 100644
--- a/addons/stock/views/stock_picking_views.xml
+++ b/addons/stock/views/stock_picking_views.xml
@@ -136,7 +136,7 @@
             <field name="priority" eval="2"/>
             <field name="arch" type="xml">
                 <calendar string="Calendar View" date_start="scheduled_date" color="partner_id" event_limit="5">
-                    <field name="partner_id"/>
+                    <field name="partner_id" filters="1"/>
                     <field name="origin"/>
                     <field name="picking_type_id"/>
                     <field name="state"/>
diff --git a/addons/web/static/src/js/views/calendar/calendar_view.js b/addons/web/static/src/js/views/calendar/calendar_view.js
index b68a134a00a..d55493186aa 100644
--- a/addons/web/static/src/js/views/calendar/calendar_view.js
+++ b/addons/web/static/src/js/views/calendar/calendar_view.js
@@ -66,9 +66,11 @@ var CalendarView = AbstractView.extend({
             if (child.tag !== 'field') return;
             var fieldName = child.attrs.name;
             fieldNames.push(fieldName);
-            if (!child.attrs.invisible) {
+            if (!child.attrs.invisible || child.attrs.filters) {
                 child.attrs.options = child.attrs.options ? pyUtils.py_eval(child.attrs.options) : {};
-                displayFields[fieldName] = {attrs: child.attrs};
+                if (!child.attrs.invisible) {
+                    displayFields[fieldName] = {attrs: child.attrs};
+                }
 
                 if (params.sidebar === false) return; // if we have not sidebar, (eg: Dashboard), we don't use the filter "coworkers"
 
@@ -92,7 +94,7 @@ var CalendarView = AbstractView.extend({
 
                     modelFilters.push(fields[fieldName].relation);
                 }
-                if (child.attrs.filter) {
+                if (child.attrs.filters) {
                     filters[fieldName] = filters[fieldName] || {
                         'title': fields[fieldName].string,
                         'fieldName': fieldName,
diff --git a/addons/web/static/tests/views/calendar_tests.js b/addons/web/static/tests/views/calendar_tests.js
index 8286bb6b4cc..25007283826 100644
--- a/addons/web/static/tests/views/calendar_tests.js
+++ b/addons/web/static/tests/views/calendar_tests.js
@@ -179,6 +179,7 @@ QUnit.module('Views', {
                 'color="partner_id">'+
                     '<filter name="user_id" avatar_field="image"/>'+
                     '<field name="partner_ids" write_model="filter_partner" write_field="partner_id"/>'+
+                    '<field name="partner_id" filters="1" invisible="1"/>'+
             '</calendar>',
             archs: archs,
             viewOptions: {
@@ -2050,6 +2051,7 @@ QUnit.module('Views', {
                 'color="partner_id">'+
                     '<filter name="user_id" avatar_field="image"/>'+
                     '<field name="partner_ids" write_model="filter_partner" write_field="partner_id"/>'+
+                    '<field name="partner_id" filters="1" invisible="1"/>'+
             '</calendar>',
             viewOptions: {
                 initialDate: initialDate,
@@ -2132,6 +2134,7 @@ QUnit.module('Views', {
                 'color="partner_id">'+
                     '<filter name="user_id" avatar_field="image"/>'+
                     '<field name="partner_ids" write_model="filter_partner" write_field="partner_id"/>'+
+                    '<field name="partner_id" filters="1" invisible="1"/>'+
             '</calendar>',
             archs: {
                 "event,false,form":
@@ -2211,6 +2214,7 @@ QUnit.module('Views', {
                 'color="partner_id">'+
                     '<filter name="user_id" avatar_field="image"/>'+
                     '<field name="partner_ids" write_model="filter_partner" write_field="partner_id"/>'+
+                    '<field name="partner_id" filters="1" invisible="1"/>'+
             '</calendar>',
             archs: {
                 "event,false,form":
@@ -2303,6 +2307,7 @@ QUnit.module('Views', {
                 'color="partner_id">'+
                     '<filter name="user_id" avatar_field="image"/>'+
                     '<field name="partner_ids" write_model="filter_partner" write_field="partner_id"/>'+
+                    '<field name="partner_id" filters="1" invisible="1"/>'+
             '</calendar>',
             viewOptions: {
                 initialDate: initialDate,
diff --git a/addons/website_event_track/views/event_track_views.xml b/addons/website_event_track/views/event_track_views.xml
index f673017d089..633ea4495b3 100644
--- a/addons/website_event_track/views/event_track_views.xml
+++ b/addons/website_event_track/views/event_track_views.xml
@@ -63,7 +63,7 @@
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <calendar date_start="date" date_delay="duration" string="Event Tracks" color="location_id" event_limit="5">
-                    <field name="location_id"/>
+                    <field name="location_id" filters="1"/>
                     <field name="event_id"/>
                     <field name="partner_id" avatar_field="image_128"/>
                     <field name="user_id" avatar_field="image_128"/>
diff --git a/odoo/addons/base/views/ir_cron_views.xml b/odoo/addons/base/views/ir_cron_views.xml
index 9409a275b4b..6be4e1c586f 100644
--- a/odoo/addons/base/views/ir_cron_views.xml
+++ b/odoo/addons/base/views/ir_cron_views.xml
@@ -52,6 +52,7 @@
             <field name="arch" type="xml">
                 <calendar string="Scheduled Actions" date_start="nextcall" color="user_id">
                     <field name="name"/>
+                    <field name="user_id" filters="1" invisible="1"/>
                 </calendar>
             </field>
         </record>