[MIG] fieldservice_account_analytic: Migration to 17.0

OCA · Nov 15, 2024 · b591504 · b591504
1 parent 2b3edfe
commit b591504
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 24 deletions.
diff --git a/fieldservice_account_analytic/README.rst b/fieldservice_account_analytic/README.rst
@@ -80,6 +80,9 @@ Contributors
 -  Serpent Consulting Services Pvt. Ltd. <[email protected]>
 -  Brian McMaster <[email protected]>
 -  Freni Patel <[email protected]>
+-  `APSL <https://apsl.tech>`__:
+
+   -  Antoni Marroig <[email protected]>
 
 Other credits
 -------------

diff --git a/fieldservice_account_analytic/__manifest__.py b/fieldservice_account_analytic/__manifest__.py
@@ -5,7 +5,7 @@
     "name": "Field Service - Analytic Accounting",
     "summary": """Track analytic accounts on Field Service locations
                   and orders""",
-    "version": "16.0.1.0.0",
+    "version": "17.0.1.0.0",
     "category": "Field Service",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/field-service",

diff --git a/fieldservice_account_analytic/init_hook.py b/fieldservice_account_analytic/init_hook.py
@@ -2,9 +2,9 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 
-def pre_init_hook(cr):
-    cr.execute("""ALTER TABLE "fsm_location" ADD "customer_id" INT;""")
-    cr.execute(
+def pre_init_hook(env):
+    env.cr.execute("""ALTER TABLE "fsm_location" ADD "customer_id" INT;""")
+    env.cr.execute(
         """UPDATE "fsm_location" SET customer_id = owner_id
     WHERE customer_id IS NULL;"""
     )
diff --git a/fieldservice_account_analytic/models/fsm_location.py b/fieldservice_account_analytic/models/fsm_location.py
@@ -38,7 +38,6 @@ def _search(
         offset=0,
         limit=None,
         order=None,
-        count=False,
         access_rights_uid=None,
     ):
         args = args or []
@@ -55,6 +54,5 @@ def _search(
             offset=offset,
             limit=limit,
             order=order,
-            count=count,
             access_rights_uid=access_rights_uid,
         )
diff --git a/fieldservice_account_analytic/models/res_partner.py b/fieldservice_account_analytic/models/res_partner.py
@@ -14,7 +14,6 @@ def _search(
         offset=0,
         limit=None,
         order=None,
-        count=False,
         access_rights_uid=None,
     ):
         args = args or []
@@ -34,6 +33,5 @@ def _search(
             offset=offset,
             limit=limit,
             order=order,
-            count=count,
             access_rights_uid=access_rights_uid,
         )
diff --git a/fieldservice_account_analytic/readme/CONTRIBUTORS.md b/fieldservice_account_analytic/readme/CONTRIBUTORS.md
@@ -2,3 +2,5 @@
 - Serpent Consulting Services Pvt. Ltd. \<<[email protected]>\>
 - Brian McMaster \<<[email protected]>\>
 - Freni Patel \<<[email protected]>\>
+- [APSL](https://apsl.tech):
+  - Antoni Marroig   \<<[email protected]>\>
diff --git a/fieldservice_account_analytic/static/description/index.html b/fieldservice_account_analytic/static/description/index.html
@@ -427,6 +427,10 @@ <h2><a class="toc-backref" href="#toc-entry-7">Contributors</a></h2>
 <li>Serpent Consulting Services Pvt. Ltd. &lt;<a class="reference external" href="mailto:support&#64;serpentcs.com">support&#64;serpentcs.com</a>&gt;</li>
 <li>Brian McMaster &lt;<a class="reference external" href="mailto:brian&#64;mcmpest.com">brian&#64;mcmpest.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_account_analytic/views/res_config_settings.xml b/fieldservice_account_analytic/views/res_config_settings.xml
@@ -5,22 +5,14 @@
         <field name="priority" eval="40" />
         <field name="inherit_id" ref="fieldservice.res_config_settings_view_form" />
         <field name="arch" type="xml">
-            <div id="orders" position="inside">
-                <div class="col-xs-12 col-md-6 o_setting_box">
-                    <div class="o_setting_left_pane">
-                        <field name="fsm_filter_location_by_contact" />
-                    </div>
-                    <div class="o_setting_right_pane">
-                        <label
-                            for="fsm_filter_location_by_contact"
-                            string="Filter Contacts with Location"
-                        />
-                        <div class="text-muted">
-                            Filter the Location on an FSM Order by the Contact
-                        </div>
-                    </div>
-                </div>
-            </div>
+            <xpath expr="//block[@name='order_setting_container']" position="inside">
+                <setting
+                    string="Filter Contacts with Location"
+                    help="Filter the Location on an FSM Order by the Contact"
+                >
+                    <field name="fsm_filter_location_by_contact" />
+                </setting>
+            </xpath>
         </field>
     </record>
 </odoo>