[MIG] base_geoengine_demo: Migration to 17.0

OCA · May 21, 2024 · 2c895f1 · 2c895f1
1 parent 60269bd
commit 2c895f1
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 10 deletions.
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/base_geoengine_demo/README.rst b/base_geoengine_demo/README.rst
@@ -75,6 +75,9 @@ Contributors
 -  Daniel Reis <dreis@opensourceintegrators.com>
 -  Alexandre Saunier <alexandre.saunier@camptocamp.com>
 -  Samuel Kouff <s.kouff@student.helmo.be>
+-  `APSL-Nagarro <https://www.apsl.tech>`__:
+
+   -  Antoni Marroig <amarroig@apsl.net>
 
 Maintainers
 -----------

diff --git a/base_geoengine_demo/__manifest__.py b/base_geoengine_demo/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 {
     "name": "Geo spatial support Demo",
-    "version": "16.0.1.0.0",
+    "version": "17.0.1.0.0",
     "category": "GeoBI",
     "author": "Camptocamp,Odoo Community Association (OCA)",
     "license": "AGPL-3",

diff --git a/base_geoengine_demo/models/geo_npa.py b/base_geoengine_demo/models/geo_npa.py
@@ -57,8 +57,6 @@ def _compute_ZIP_total_sales(self):
             else:
                 rec.total_sales = 0.0
 
-    def name_get(self):
-        res = []
+    def _compute_display_name(self):
         for rec in self:
-            res.append((rec.id, f"{rec.name} {rec.city}"))
-        return res
+            rec.display_name = f"{rec.name} {rec.city}"
diff --git a/base_geoengine_demo/readme/CONTRIBUTORS.md b/base_geoengine_demo/readme/CONTRIBUTORS.md
@@ -5,3 +5,5 @@
 - Daniel Reis \<<dreis@opensourceintegrators.com>\>
 - Alexandre Saunier \<<alexandre.saunier@camptocamp.com>\>
 - Samuel Kouff \<<s.kouff@student.helmo.be>\>
+- [APSL-Nagarro](https://www.apsl.tech):
+  - Antoni Marroig \<<amarroig@apsl.net>\>
diff --git a/base_geoengine_demo/static/description/index.html b/base_geoengine_demo/static/description/index.html
@@ -420,6 +420,10 @@ <h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
 <li>Daniel Reis &lt;<a class="reference external" href="mailto:dreis&#64;opensourceintegrators.com">dreis&#64;opensourceintegrators.com</a>&gt;</li>
 <li>Alexandre Saunier &lt;<a class="reference external" href="mailto:alexandre.saunier&#64;camptocamp.com">alexandre.saunier&#64;camptocamp.com</a>&gt;</li>
 <li>Samuel Kouff &lt;<a class="reference external" href="mailto:s.kouff&#64;student.helmo.be">s.kouff&#64;student.helmo.be</a>&gt;</li>
+<li><a class="reference external" href="https://www.apsl.tech">APSL-Nagarro</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="maintainers">

diff --git a/base_geoengine_demo/views/zip.xml b/base_geoengine_demo/views/zip.xml
@@ -29,10 +29,7 @@
             <field name="the_geom_multipoint" />
           </page>-->
             <page string="Retail machines">
-              <field
-                                name="retail_machine_ids"
-                                context="{'default_zip_id': active_id}"
-                            />
+              <field name="retail_machine_ids" context="{'default_zip_id': id}" />
             </page>
           </notebook>
         </sheet>