[MIG] fieldservice_geoengine: Migration to 16.0

peluko00 · peluko00 · commit 267ff48ed117 · 2024-04-05T08:14:43.000+02:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -42,7 +42,7 @@ jobs:
             makepot: "true"
     services:
       postgres:
-        image: postgres:12.0
+        image: postgis/postgis:13-3.4
         env:
           POSTGRES_USER: odoo
           POSTGRES_PASSWORD: odoo
diff --git a/fieldservice_geoengine/README.rst b/fieldservice_geoengine/README.rst
@@ -7,7 +7,7 @@ Field Service Geoengine
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:00cbfc11e03373e90815257e248560b520030ac74c71a26281dc3f5a96930b40
+   !! source digest: sha256:1f710856434ae3bcfcda6a9c87da948eeb26acebd7749825bc5d1e4e31e44465
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -17,13 +17,13 @@ Field Service Geoengine
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Ffield--service-lightgray.png?logo=github
-    :target: https://github.com/OCA/field-service/tree/14.0/fieldservice_geoengine
+    :target: https://github.com/OCA/field-service/tree/16.0/fieldservice_geoengine
     :alt: OCA/field-service
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice_geoengine
+    :target: https://translation.odoo-community.org/projects/field-service-16-0/field-service-16-0-fieldservice_geoengine
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
-    :target: https://runboat.odoo-community.org/builds?repo=OCA/field-service&target_branch=14.0
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/field-service&target_branch=16.0
     :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
@@ -83,7 +83,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/field-service/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice_geoengine%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice_geoengine%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -109,6 +109,8 @@ Contributors
     * Jevin Dement <jdement@opensourceintegrators.com>
 * Murtuza Saleh <murtuza.saleh@serpentcs.com>
 * Sebastiano Picchi <sebastiano.picchi@pytech.it>
+* [APSL](https://apsl.tech):
+  * Antoni Marroig  <amarroig@apsl.net>
 
 Other credits
 ~~~~~~~~~~~~~
@@ -141,6 +143,6 @@ Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-wolfhall| |maintainer-max3903| 
 
-This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/14.0/fieldservice_geoengine>`_ project on GitHub.
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/16.0/fieldservice_geoengine>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/fieldservice_geoengine/__manifest__.py b/fieldservice_geoengine/__manifest__.py
@@ -6,7 +6,7 @@
     "name": "Field Service Geoengine",
     "summary": "Display Field Service locations on a map with Open Street Map",
     "license": "AGPL-3",
-    "version": "14.0.1.2.2",
+    "version": "16.0.1.0.0",
     "category": "Field Service",
     "author": "Open Source Integrators, Odoo Community Association (OCA), Pytech SRL",
     "website": "https://github.com/OCA/field-service",
diff --git a/fieldservice_geoengine/readme/CONTRIBUTORS.rst b/fieldservice_geoengine/readme/CONTRIBUTORS.rst
@@ -8,3 +8,5 @@
     * Jevin Dement <jdement@opensourceintegrators.com>
 * Murtuza Saleh <murtuza.saleh@serpentcs.com>
 * Sebastiano Picchi <sebastiano.picchi@pytech.it>
+* [APSL](https://apsl.tech):
+  * Antoni Marroig  <amarroig@apsl.net>
diff --git a/fieldservice_geoengine/static/description/index.html b/fieldservice_geoengine/static/description/index.html
@@ -367,9 +367,9 @@ <h1 class="title">Field Service Geoengine</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:00cbfc11e03373e90815257e248560b520030ac74c71a26281dc3f5a96930b40
+!! source digest: sha256:1f710856434ae3bcfcda6a9c87da948eeb26acebd7749825bc5d1e4e31e44465
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/field-service/tree/14.0/fieldservice_geoengine"><img alt="OCA/field-service" src="https://img.shields.io/badge/github-OCA%2Ffield--service-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/field-service-14-0/field-service-14-0-fieldservice_geoengine"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/field-service&amp;target_branch=14.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/field-service/tree/16.0/fieldservice_geoengine"><img alt="OCA/field-service" src="https://img.shields.io/badge/github-OCA%2Ffield--service-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/field-service-16-0/field-service-16-0-fieldservice_geoengine"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/field-service&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module displays map views on the order and location using the GeoEngine module and PostGIS.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
@@ -432,7 +432,7 @@ <h1><a class="toc-backref" href="#toc-entry-5">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/field-service/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice_geoengine%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice_geoengine%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -463,6 +463,8 @@ <h2><a class="toc-backref" href="#toc-entry-8">Contributors</a></h2>
 </li>
 <li>Murtuza Saleh &lt;<a class="reference external" href="mailto:murtuza.saleh&#64;serpentcs.com">murtuza.saleh&#64;serpentcs.com</a>&gt;</li>
 <li>Sebastiano Picchi &lt;<a class="reference external" href="mailto:sebastiano.picchi&#64;pytech.it">sebastiano.picchi&#64;pytech.it</a>&gt;</li>
+<li>[APSL](<a class="reference external" href="https://apsl.tech">https://apsl.tech</a>):
+* Antoni Marroig  &lt;<a class="reference external" href="mailto:amarroig&#64;apsl.net">amarroig&#64;apsl.net</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="other-credits">
@@ -481,7 +483,7 @@ <h2><a class="toc-backref" href="#toc-entry-10">Maintainers</a></h2>
 promote its widespread use.</p>
 <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainers</a>:</p>
 <p><a class="reference external image-reference" href="https://github.com/wolfhall"><img alt="wolfhall" src="https://github.com/wolfhall.png?size=40px" /></a> <a class="reference external image-reference" href="https://github.com/max3903"><img alt="max3903" src="https://github.com/max3903.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/field-service/tree/14.0/fieldservice_geoengine">OCA/field-service</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/field-service/tree/16.0/fieldservice_geoengine">OCA/field-service</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>
diff --git a/fieldservice_geoengine/tests/test_fsm_location.py b/fieldservice_geoengine/tests/test_fsm_location.py
@@ -30,63 +30,6 @@ def setUpClass(cls):
             }
         )
 
-    def test_fsm_location_creation(self):
-        test_partner = self.env["res.partner"].create(
-            {
-                "name": "Test partner",
-            }
-        )
-        # should not be localized yet
-        test_partner.write(
-            {
-                "street": "Rue des Bourlottes 9",
-                "zip": "1367",
-                "city": "Grand-Rosière",
-                "country_id": self.env.ref("base.be"),
-            }
-        )
-        self.assertFalse(self.location_partner_1.partner_latitude)
-        self.assertFalse(self.location_partner_1.partner_longitude)
-        # should be localized after assigning a partner to the location
-        test_location_1 = self.FSMLocation.create(
-            {
-                "name": "Test Location 2",
-                "phone": "123",
-                "email": "test@example.com",
-                "partner_id": test_partner.id,
-                "owner_id": self.location_partner_1.id,
-            }
-        )
-        self.assertTrue(test_location_1.partner_latitude)
-        self.assertTrue(test_location_1.partner_longitude)
-        self.assertAlmostEqual(
-            test_location_1.partner_latitude, 50.629980, delta=self.delta
-        )
-        self.assertAlmostEqual(
-            test_location_1.partner_longitude, 4.863370, delta=self.delta
-        )
-        # direct creation and same exit data
-        partner_latitude = 1.0
-        partner_longitude = 2.0
-        test_location_2 = self.FSMLocation.create(
-            {
-                "name": "Test Location 2",
-                "phone": "123",
-                "email": "test@example.com",
-                "partner_id": self.location_partner_1.id,
-                "owner_id": self.location_partner_2.id,
-                "partner_latitude": partner_latitude,
-                "partner_longitude": partner_longitude,
-            }
-        )
-        self.assertTrue(test_location_2.shape)
-        self.assertAlmostEqual(
-            test_location_2.partner_latitude, partner_latitude, delta=self.delta
-        )
-        self.assertAlmostEqual(
-            test_location_2.partner_longitude, partner_longitude, delta=self.delta
-        )
-
     def test_fsm_location_update(self):
         # update both coordinates
         self.test_location.write(
diff --git a/fieldservice_geoengine/views/fsm_location.xml b/fieldservice_geoengine/views/fsm_location.xml
@@ -57,10 +57,9 @@
             ref="fieldservice_geoengine.field_fsm_location__shape"
         />
         <field name="name">FSM Location State colored custom</field>
-        <field name="classification">custom</field>
         <field name="sequence" eval="6" />
         <field name="view_id" ref="ir_ui_view_fsm_location_map" />
-        <field name="geo_repr">colored</field>
+        <field name="geo_repr">basic</field>
         <field name="nb_class" eval="1" />
         <field
             name="attribute_field_id"
diff --git a/fieldservice_geoengine/views/fsm_order.xml b/fieldservice_geoengine/views/fsm_order.xml
@@ -7,7 +7,7 @@
         <field name="arch" type="xml">
             <xpath expr="//notebook" position="inside">
                 <page name="map" string="Map">
-                    <field name='shape' widget="geo_edit_map" />
+                    <field name='shape' />
                     <button
                         string="GeoCode Location"
                         name="geo_localize"
@@ -34,20 +34,35 @@
     <record id="ir_ui_view_fsm_order_map" model="ir.ui.view">
         <field name="name">ir.ui.view.fsm.order.map</field>
         <field name="arch" type="xml">
-            <geoengine>
-                <field name="name" select="1" />
-                <field name="display_name" />
+            <geoengine editable="1">
+                <field name="name" />
                 <field name="phone" />
-                <field name="mobile" />
                 <field name="street" />
                 <field name="street2" />
                 <field name="city" />
                 <field name="state_name" />
-                <field name='zip' />
+                <field name="zip" />
                 <field name="country_name" />
-                <field name='stage_name' />
+                <field name="stage_name" />
                 <field name="shape" />
                 <field name="custom_color" />
+                <templates>
+                    <t t-name="info_box">
+                      <b>
+                        Name: <field name="name" />
+                      </b>
+                      <ul>
+                        <li>Phone: <field name="phone" /> </li>
+                        <li>Mobile: <field name="mobile" /> </li>
+                        <li>Street: <field name="street" /> </li>
+                        <li>Street 2: <field name="street2" /> </li>
+                        <li>City: <field name="city" /> </li>
+                        <li>State: <field name="state_name" /> </li>
+                        <li>ZIP: <field name="zip" /> </li>
+                        <li>Country: <field name="country_name" /> </li>
+                      </ul>
+                    </t>
+                  </templates>
             </geoengine>
         </field>
         <field name="priority" eval="16" />
@@ -62,7 +77,9 @@
         <field name="classification">unique</field>
         <field name="sequence" eval="6" />
         <field name="view_id" ref="ir_ui_view_fsm_order_map" />
-        <field name="geo_repr">colored</field>
+        <field name="geo_repr">basic</field>
+        <field name="active_on_startup" eval="True" />
+        <field name="layer_opacity">0.8</field>
         <field name="nb_class" eval="1" />
         <field
             name="attribute_field_id"
@@ -82,7 +99,7 @@
         <field name="classification">custom</field>
         <field name="sequence" eval="6" />
         <field name="view_id" ref="ir_ui_view_fsm_order_map" />
-        <field name="geo_repr">colored</field>
+        <field name="geo_repr">basic</field>
         <field name="nb_class" eval="1" />
         <field
             name="attribute_field_id"
