[REF] base_geolocalize, base_setup: ref + make it configurable in settings

Migrate in v12 and Refactor a part of the code
Allow to configure it in setting

1 files changed, 6 insertions, 17 deletions

diff --git a/addons/website_crm_partner_assign/models/crm_lead.py b/addons/website_crm_partner_assign/models/crm_lead.py
index 49cbc6fdb27..cd90ea185ef 100644
--- a/addons/website_crm_partner_assign/models/crm_lead.py
+++ b/addons/website_crm_partner_assign/models/crm_lead.py
@@ -4,9 +4,9 @@
 import random
 
 from odoo import api, fields, models, _
-from odoo.addons.base_geolocalize.models.res_partner import geo_find, geo_query_address
 from odoo.exceptions import AccessDenied
 
+
 class CrmLead(models.Model):
     _inherit = "crm.lead"
     partner_latitude = fields.Float('Geo Latitude', digits=(16, 5))
@@ -65,7 +65,7 @@ class CrmLead(models.Model):
                 tag_to_add = self.env.ref('website_crm_partner_assign.tag_portal_lead_partner_unavailable', False)
                 lead.write({'tag_ids': [(4, tag_to_add.id, False)]})
                 continue
-            lead.assign_geo_localize(lead.partner_latitude, lead.partner_longitude,)
+            lead.assign_geo_localize(lead.partner_latitude, lead.partner_longitude)
             partner = self.env['res.partner'].browse(partner_id)
             if partner.user_id:
                 lead.allocate_salesman(partner.user_id.ids, team_id=partner.team_id.id)
@@ -81,26 +81,15 @@ class CrmLead(models.Model):
                 'partner_longitude': longitude
             })
             return True
-        geo_obj = self.env['base.geocoder']
         # Don't pass context to browse()! We need country name in english below
         for lead in self:
             if lead.partner_latitude and lead.partner_longitude:
                 continue
             if lead.country_id:
-                result = geo_obj.geo_find(geo_obj.geo_query_address(
-                    street=lead.street,
-                    zip=lead.zip,
-                    city=lead.city,
-                    state=lead.state_id.name,
-                    country=lead.country_id.name))
-
-                if result is None:
-                    result = geo_obj.geo_find(geo_obj.geo_query_address(
-                        city=lead.city,
-                        state=lead.state_id.name,
-                        country=lead.country_id.name
-                    ))
-
+                result = self.env['res.partner']._geo_localize(
+                    lead.street, lead.zip, lead.city,
+                    lead.state_id.name, lead.country_id.name
+                )
                 if result:
                     lead.write({
                         'partner_latitude': result[0],