[MIG] fieldservice_recurring: Migration to 17.0

OCA · Apr 16, 2024 · ea962dd · ea962dd
1 parent c359378
commit ea962dd
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 33 deletions.
diff --git a/fieldservice_recurring/README.rst b/fieldservice_recurring/README.rst
@@ -127,6 +127,9 @@ Contributors
 -  Kitti Upariphutthiphone <[email protected]>
 -  Raphaël Reverdy <[email protected]>
 -  Freni Patel <[email protected]>
+-  `APSL <https://apsl.tech>`__:
+
+   -  Antoni Marroig <[email protected]>
 
 Other credits
 -------------

diff --git a/fieldservice_recurring/__manifest__.py b/fieldservice_recurring/__manifest__.py
@@ -4,7 +4,7 @@
 {
     "name": "Field Service Recurring Work Orders",
     "summary": "Manage recurring Field Service orders",
-    "version": "16.0.2.0.0",
+    "version": "17.0.1.0.0",
     "category": "Field Service",
     "author": "Brian McMaster, "
     "Open Source Integrators, "

diff --git a/fieldservice_recurring/migrations/16.0.2.0.0/pre-migration.py b/fieldservice_recurring/migrations/16.0.2.0.0/pre-migration.py
diff --git a/fieldservice_recurring/readme/CONTRIBUTORS.md b/fieldservice_recurring/readme/CONTRIBUTORS.md
@@ -2,3 +2,5 @@
 - Kitti Upariphutthiphone \<<[email protected]>\>
 - Raphaël Reverdy \<<[email protected]>\>
 - Freni Patel \<<[email protected]>\>
+- [APSL](https://apsl.tech):
+  - Antoni Marroig  \<<[email protected]>\>
diff --git a/fieldservice_recurring/static/description/index.html b/fieldservice_recurring/static/description/index.html
@@ -479,6 +479,10 @@ <h2><a class="toc-backref" href="#toc-entry-8">Contributors</a></h2>
 <li>Kitti Upariphutthiphone &lt;<a class="reference external" href="mailto:kittiu&#64;ecosoft.co.th">kittiu&#64;ecosoft.co.th</a>&gt;</li>
 <li>Raphaël Reverdy &lt;<a class="reference external" href="mailto:raphael.reverdy&#64;akretion.com">raphael.reverdy&#64;akretion.com</a>&gt;</li>
 <li>Freni Patel &lt;<a class="reference external" href="mailto:fpatel&#64;opensourceintegrators.com">fpatel&#64;opensourceintegrators.com</a>&gt;</li>
+<li><a class="reference external" href="https://apsl.tech">APSL</a>:<ul>
+<li>Antoni Marroig &lt;<a class="reference external" href="mailto:amarroig&#64;apsl.net">amarroig&#64;apsl.net</a>&gt;</li>
+</ul>
+</li>
 </ul>
 </div>
 <div class="section" id="other-credits">

diff --git a/fieldservice_recurring/views/fsm_frequency.xml b/fieldservice_recurring/views/fsm_frequency.xml
@@ -24,7 +24,7 @@
                         name="web_ribbon"
                         text="Archived"
                         bg_color="bg-danger"
-                        attrs="{'invisible': [('active', '=', True)]}"
+                        invisible="active"
                     />
                     <div class="oe_title">
                         <h1>
@@ -49,10 +49,7 @@
                             <group>
                                 <field name="use_byweekday" />
                             </group>
-                            <div
-                                attrs="{'invisible': [('use_byweekday', '=', False)]}"
-                                name="weekdays"
-                            >
+                            <div invisible="not use_byweekday" name="weekdays">
                                 <group>
                                     <field name="mo" />
                                     <field name="tu" />
@@ -66,21 +63,15 @@
                             <group>
                                 <field name="use_bymonthday" />
                             </group>
-                            <div
-                                attrs="{'invisible': [('use_bymonthday', '=', False)]}"
-                                name="monthday"
-                            >
+                            <div invisible="not use_bymonthday" name="monthday">
                                 <group>
                                     <field name="month_day" />
                                 </group>
                             </div>
                             <group>
                                 <field name="use_setpos" />
                             </group>
-                            <div
-                                attrs="{'invisible': [('use_setpos', '=', False)]}"
-                                name="setpos"
-                            >
+                            <div invisible="not use_setpos" name="setpos">
                                 <group>
                                     <field name="set_pos" />
                                 </group>
@@ -90,10 +81,7 @@
                             <group>
                                 <field name="use_bymonth" />
                             </group>
-                            <div
-                                attrs="{'invisible': [('use_bymonth', '=', False)]}"
-                                name="months"
-                            >
+                            <div invisible="not use_bymonth" name="months">
                                 <group>
                                     <field name="jan" />
                                     <field name="feb" />

diff --git a/fieldservice_recurring/views/fsm_frequency_set.xml b/fieldservice_recurring/views/fsm_frequency_set.xml
@@ -21,7 +21,7 @@
                         name="web_ribbon"
                         text="Archived"
                         bg_color="bg-danger"
-                        attrs="{'invisible': [('active', '=', True)]}"
+                        invisible="active"
                     />
                     <div class="oe_title">
                         <h1>

diff --git a/fieldservice_recurring/views/fsm_order.xml b/fieldservice_recurring/views/fsm_order.xml
@@ -9,11 +9,11 @@
                     name="action_view_fsm_recurring"
                     class="oe_stat_button"
                     icon="fa-calendar"
-                    attrs="{'invisible': [('fsm_recurring_id', '=', False)]}"
+                    invisible="not fsm_recurring_id"
                     groups="fieldservice_recurring.group_fsm_recurring"
                 >
                     <span class="o_stat_text">Recurring Order</span>
-                    <field name="fsm_recurring_id" attrs="{'invisible': 1}" />
+                    <field name="fsm_recurring_id" invisible="1" />
                 </button>
             </xpath>
         </field>

diff --git a/fieldservice_recurring/views/fsm_recurring.xml b/fieldservice_recurring/views/fsm_recurring.xml
@@ -31,15 +31,15 @@
                         class="oe_highlight"
                         type="object"
                         groups="fieldservice.group_fsm_dispatcher"
-                        attrs="{'invisible': [('state', 'in',('close', 'progress'))]}"
+                        invisible="state in ['close', 'progress']"
                     />
                     <button
                         id="action_suspend"
                         name="action_suspend"
                         string="Suspend"
                         type="object"
                         groups="fieldservice.group_fsm_dispatcher"
-                        attrs="{'invisible': [('state', 'in', ('draft', 'close'))]}"
+                        invisible="state in ['draft', 'close']"
                     />
                     <field name="state" widget="statusbar" />
                 </header>

diff --git a/fieldservice_recurring/views/fsm_recurring_template.xml b/fieldservice_recurring/views/fsm_recurring_template.xml
@@ -22,7 +22,7 @@
                         name="web_ribbon"
                         text="Archived"
                         bg_color="bg-danger"
-                        attrs="{'invisible': [('active', '=', True)]}"
+                        invisible="active"
                     />
                     <div class="oe_title">
                         <h1>

diff --git a/fieldservice_route/views/fsm_route_dayroute.xml b/fieldservice_route/views/fsm_route_dayroute.xml
@@ -75,14 +75,14 @@
                                         string="Complete order"
                                         type="object"
                                         icon="fa-check text-success"
-                                        attrs="{'invisible': [('stage_id', 'in', [%(fieldservice.fsm_stage_completed)d, %(fieldservice.fsm_stage_cancelled)d])]}"
+                                        invisible="stage_id in [%(fieldservice.fsm_stage_completed)d, %(fieldservice.fsm_stage_cancelled)d]"
                                     />
                                     <button
                                         name="action_cancel"
                                         string="Cancel order"
                                         type="object"
                                         icon="fa-times-circle text-danger"
-                                        attrs="{'invisible': [('stage_id', 'in', [%(fieldservice.fsm_stage_completed)d, %(fieldservice.fsm_stage_cancelled)d])]}"
+                                        invisible="stage_id in [%(fieldservice.fsm_stage_completed)d, %(fieldservice.fsm_stage_cancelled)d]"
                                     />
                                 </tree>
                             </field>