From b511ea3306b7f6055283f266ef470a4fa29c9820 Mon Sep 17 00:00:00 2001
From: Brian McMaster <brian@mcmpest.com>
Date: Wed, 15 Nov 2023 20:45:32 -0500
Subject: [PATCH] fix view attrs

---
 fieldservice/views/fsm_location.xml |  6 +++---
 fieldservice/views/fsm_order.xml    | 10 +++++-----
 fieldservice/views/fsm_person.xml   | 13 ++++++-------
 fieldservice/views/fsm_stage.xml    |  2 +-
 fieldservice/views/res_partner.xml  |  2 +-
 5 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/fieldservice/views/fsm_location.xml b/fieldservice/views/fsm_location.xml
index 63c7fa552b..13b2f003bb 100644
--- a/fieldservice/views/fsm_location.xml
+++ b/fieldservice/views/fsm_location.xml
@@ -226,7 +226,7 @@
                                             /></span>
                                         <br />
                                         <span
-                                            attrs="{'invisible': [('date_localization', '=', False)]}"
+                                            invisible="not date_localization"
                                         >Updated on:
                                             <field
                                                 name="date_localization"
@@ -237,7 +237,7 @@
                                             <br />
                                         </span>
                                         <button
-                                            attrs="{'invisible': ['|', ('partner_latitude', '!=', 0), ('partner_longitude', '!=', 0)]}"
+                                            invisible="(partner_latitude != 0) or (partner_longitude != 0)"
                                             icon="fa-gear"
                                             string="Compute based on address"
                                             title="Compute Localization"
@@ -246,7 +246,7 @@
                                             class="btn btn-link p-0"
                                         />
                                         <button
-                                            attrs="{'invisible': [('partner_latitude', '=', 0), ('partner_longitude', '=', 0)]}"
+                                            invisible="partner_latitude == partner_longitude == 0"
                                             icon="fa-refresh"
                                             string="Refresh"
                                             title="Refresh Localization"
diff --git a/fieldservice/views/fsm_order.xml b/fieldservice/views/fsm_order.xml
index 9646f12810..7a3e892569 100644
--- a/fieldservice/views/fsm_order.xml
+++ b/fieldservice/views/fsm_order.xml
@@ -15,7 +15,7 @@
                         class="oe_highlight"
                         type="object"
                         groups="fieldservice.group_fsm_user"
-                        attrs="{'invisible': [('stage_id', 'in', (%(fieldservice.fsm_stage_completed)d, %(fieldservice.fsm_stage_cancelled)d))]}"
+                        invisible="stage_id.is_closed"
                     />
                     <button
                         id="action_cancel"
@@ -23,7 +23,7 @@
                         string="Cancel Order"
                         type="object"
                         groups="fieldservice.group_fsm_dispatcher"
-                        attrs="{'invisible': [('stage_id', 'in', (%(fieldservice.fsm_stage_completed)d, %(fieldservice.fsm_stage_cancelled)d))]}"
+                        invisible="stage_id.is_closed"
                     />
                     <field
                         name="stage_id"
@@ -75,7 +75,7 @@
                             <field name="internal_type" invisible="1" />
                             <field
                                 name="equipment_id"
-                                attrs="{'invisible':[('internal_type', 'not in',['repair', 'maintenance'])]}"
+                                invisible="internal_type not in ['repair', 'maintenance']"
                                 groups="fieldservice.group_fsm_equipment"
                                 options="{'no_create': True}"
                                 domain="[('current_location_id','=',location_id)]"
@@ -180,11 +180,11 @@
                             string="Equipments"
                             groups="fieldservice.group_fsm_equipment"
                             name="equipements_page"
-                            attrs="{'invisible': [('internal_type', 'in', ['repair', 'maintenance'])]}"
+                            invisible="internal_type in ['repair', 'maintenance']"
                         >
                             <field
                                 name="equipment_ids"
-                                attrs="{'required': [('internal_type', 'not in', ['repair', 'maintenance'])]}"
+                                required="internal_type not in ['repair', 'maintenance']"
                                 options="{'no_create': True}"
                                 domain="[('current_location_id','=',location_id)]"
                             >
diff --git a/fieldservice/views/fsm_person.xml b/fieldservice/views/fsm_person.xml
index 052d226996..396c3aa1e4 100644
--- a/fieldservice/views/fsm_person.xml
+++ b/fieldservice/views/fsm_person.xml
@@ -64,7 +64,7 @@
                         name="web_ribbon"
                         title="Archived"
                         bg_color="bg-danger"
-                        attrs="{'invisible': [('active', '=', True)]}"
+                        invisible="active"
                     />
                     <field
                         name="active_partner"
@@ -74,12 +74,11 @@
                     />
                     <div
                         class="alert alert-info text-center o_form_header"
-                        attrs="{'invisible': [
-                            '|', '|',
-                            '&amp;', ('active', '=', True), ('active_partner', '=', True),
-                            '&amp;', ('active', '=', False), ('active_partner', '=', False),
-                            '&amp;', ('active', '=', True), ('active_partner', '=', False),
-                        ]}"
+                        invisible="
+                            (active and active_partner) or
+                            (not active and not active_partner) or
+                            (active and not active_partner)
+                        "
                         role="alert"
                     >
                         <a class="close" data-dismiss="alert" href="#">x</a>
diff --git a/fieldservice/views/fsm_stage.xml b/fieldservice/views/fsm_stage.xml
index 9dcd969eb9..479ddd9dd6 100644
--- a/fieldservice/views/fsm_stage.xml
+++ b/fieldservice/views/fsm_stage.xml
@@ -23,7 +23,7 @@
                         name="web_ribbon"
                         title="Archived"
                         bg_color="bg-danger"
-                        attrs="{'invisible': [('active', '=', True)]}"
+                        invisible="active"
                     />
                     <group>
                         <group>
diff --git a/fieldservice/views/res_partner.xml b/fieldservice/views/res_partner.xml
index 96ccfc58e8..c89d20cd9f 100644
--- a/fieldservice/views/res_partner.xml
+++ b/fieldservice/views/res_partner.xml
@@ -23,7 +23,7 @@
                 <button
                     class="oe_stat_button"
                     type="object"
-                    attrs="{'invisible': [('owned_location_count', '=', 0)]}"
+                    invisible="owned_location_count = 0"
                     name="action_open_owned_locations"
                     icon="fa-map-marker"
                     context="{'default_owner_id': id}"