[16.0][MIG] - geoengine_base_geolocalize

geoengine_base_geolocalize/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #   Author: Laurent Mignon

geoengine_base_geolocalize/__manifest__.py

@@ -1,25 +1,15 @@
-# -*- coding: utf-8 -*-
 # Copyright 2015-2017 ACSONE SA/NV (<http://acsone.eu>)
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 {
-    'name': 'Geospatial support for base_geolocalize',
-    'version': '10.0.1.0.1',
-    'category': 'GeoBI',
-    'author': "ACSONE SA/NV, Odoo Community Association (OCA)",
-    'license': 'AGPL-3',
-    'website': 'https://github.com/OCA/geospatial',
-    'depends': [
-        'base',
-        'geoengine_partner',
-    ],
-    'external_dependencies': {
-        'python': [
-            'requests'
-        ],
-    },
-    'data': [
-        'views/res_partner_view.xml'
-    ],
-    'application': True,
-    'autoinstall': True,
+    "name": "Geospatial support for base_geolocalize",
+    "version": "16.0.1.0.1",
+    "category": "GeoBI",
+    "author": "ACSONE SA/NV, Odoo Community Association (OCA)",
+    "license": "AGPL-3",
+    "website": "https://github.com/OCA/geospatial",
+    "depends": ["base", "geoengine_partner", "base_geolocalize"],
+    "external_dependencies": {"python": ["requests"]},
+    "data": ["views/res_partner_view.xml"],
+    "application": True,
+    "autoinstall": True,
 }

geoengine_base_geolocalize/models/res_partner.py

@@ -1,18 +1,15 @@
-# -*- coding: utf-8 -*-
 # Copyright 2015 ACSONE SA/NV (<http://acsone.eu>)
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
-from odoo import api
-from odoo.addons.base_geoengine import geo_model
-from odoo.addons.base_geoengine import fields as geo_fields
+from odoo import api, fields, models
 
 
-class ResPartner(geo_model.GeoModel):
+class ResPartner(models.Model):
     """Add geo_point to partner using a function field"""
+
     _inherit = "res.partner"
 
-    @api.multi
-    @api.depends('partner_latitude', 'partner_longitude')
+    @api.depends("partner_latitude", "partner_longitude")
     def _compute_geo_point(self):
         """
         Set the `geo_point` of the partner depending of its `partner_latitude`
@@ -25,17 +22,20 @@ def _compute_geo_point(self):
             if not rec.partner_latitude or not rec.partner_longitude:
                 rec.geo_point = False
             else:
-                rec.geo_point = geo_fields.GeoPoint.from_latlon(
-                    rec.env.cr, rec.partner_latitude, rec.partner_longitude)
+                rec.geo_point = fields.GeoPoint.from_latlon(
+                    rec.env.cr, rec.partner_latitude, rec.partner_longitude
+                )
 
-    geo_point = geo_fields.GeoPoint(
-        store=True, compute='_compute_geo_point', inverse='_inverse_geo_point')
+    geo_point = fields.GeoPoint(
+        store=True, compute="_compute_geo_point", inverse="_inverse_geo_point"
+    )
 
-    @api.multi
     def _inverse_geo_point(self):
         for rec in self:
             if not rec.geo_point:
                 rec.partner_longitude, rec.partner_latitude = False, False
             else:
-                rec.partner_longitude, rec.partner_latitude = \
-                    geo_fields.GeoPoint.to_latlon(rec.env.cr, rec.geo_point)
+                (
+                    rec.partner_longitude,
+                    rec.partner_latitude,
+                ) = fields.GeoPoint.to_latlon(rec.env.cr, rec.geo_point)

geoengine_base_geolocalize/tests/__init__.py

@@ -1,3 +1 @@
-# -*- coding: utf-8 -*-
-
 from . import test_geoengine_partner

geoengine_base_geolocalize/tests/test_geoengine_partner.py

@@ -1,42 +1,42 @@
-# -*- coding: utf-8 -*-
 # Copyright 2015-2017 ACSONE SA/NV (<http://acsone.eu>)
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
-import odoo.tests.common as common
+from odoo.tests.common import TransactionCase
 
 
-class TestGeoenginePartner(common.TransactionCase):
-
+class TestGeoenginePartner(TransactionCase):
     def test_get_geo_point(self):
-        partner_id = self.env.ref('base.user_root').partner_id
+        partner_id = self.env.ref("base.user_root").partner_id
         partner_id.partner_longitude = False
         partner_id.partner_latitude = False
         self.assertFalse(
-            partner_id.geo_point, 'Should not have geo_point with no latlon')
+            partner_id.geo_point, "Should not have geo_point with no latlon"
+        )
         partner_id.partner_latitude = 20
         self.assertFalse(
-            partner_id.geo_point, 'Should not have geo_point with no latlon')
+            partner_id.geo_point, "Should not have geo_point with no latlon"
+        )
         partner_id.partner_longitude = 20
-        self.assertTrue(
-            partner_id.geo_point, 'Should have geo_point')
+        self.assertTrue(partner_id.geo_point, "Should have geo_point")
 
     def test_geo_localize(self):
         vals = {
-            'name': 'Partner Project',
-            'street': 'Rue au bois la dame',
-            'country_id': self.env.ref('base.be').id,
-            'zip': '6800',
+            "name": "Partner Project",
+            "street": "Rue au bois la dame",
+            "country_id": self.env.ref("base.be").id,
+            "zip": "6800",
         }
-        partner_id = self.env['res.partner'].create(vals)
-        partner_id.name = 'Other Partner'
-        partner_id.geo_localize()
+        partner_id = self.env["res.partner"].create(vals)
+        partner_id.name = "Other Partner"
+        partner_id.with_context(force_geo_localize=True).geo_localize()
         self.assertAlmostEqual(
-            partner_id.partner_latitude, 49.95353, 5,
-            'Latitude Should be equals')
+            partner_id.partner_latitude, 49.9535323, 2, "Latitude Should be equals"
+        )
         self.assertAlmostEqual(
-            partner_id.partner_longitude, 5.40539, 5,
-            'Longitude Should be equals')
-        domain = [('id', '=', partner_id.id)]
+            partner_id.partner_longitude, 5.4119073, 2, "Longitude Should be equals"
+        )
+        domain = [("id", "=", partner_id.id)]
         partner_id.unlink()
         self.assertFalse(
-            self.env['res.partner'].search(domain),
-            'Should not have this partner anymore')
+            self.env["res.partner"].search(domain),
+            "Should not have this partner anymore",
+        )

geoengine_base_geolocalize/views/res_partner_view.xml

@@ -1,14 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
-    <record model="ir.ui.view" id="geoengine_partner.geo_partner_view_form">
+    <record model="ir.ui.view" id="geo_partner_view_form">
         <field name="name">geo_partner_form</field>
         <field name="model">res.partner</field>
-        <field name="inherit_id" ref="base_geolocalize.view_crm_partner_geo_form"/>
+        <field name="inherit_id" ref="geoengine_partner.geo_partner_view_form" />
         <field name="arch" type="xml">
+            <xpath expr="//page[@name='geoengine_map']" position="attributes">
+                <attribute name="invisible">1</attribute>
+            </xpath>
             <xpath expr="//page[@name='geo_location']/group" position="after">
-                <field name="geo_point" widget="geo_edit_map"
-                       groups="base_geoengine.group_geoengine_user,base_geoengine.group_geoengine_admin"/>
+                <field
+                    name="geo_point"
+                    groups="base_geoengine.group_geoengine_user,base_geoengine.group_geoengine_admin"
+                />
             </xpath>
         </field>
     </record>

requirements.txt

@@ -0,0 +1,2 @@
+# generated from manifests external_dependencies
+requests

setup/geoengine_base_geolocalize/odoo/addons/geoengine_base_geolocalize

@@ -0,0 +1 @@
+../../../../geoengine_base_geolocalize

setup/geoengine_base_geolocalize/setup.py

@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)