summaryrefslogtreecommitdiff
path: root/addons/website_crm_partner_assign
diff options
context:
space:
mode:
authorJeremy Kersten <jke@odoo.com>2018-09-12 17:05:44 +0200
committerJeremy Kersten <jke@odoo.com>2018-09-12 17:07:23 +0200
commite6ca846c65bd94bf4c3ecb57847e93ae8ecaa9e9 (patch)
tree5c3ea4f298a59345b14c2feea4abdfc65731107a /addons/website_crm_partner_assign
parent72d7dd8994f21978379f6a80c0c21d56719f342f (diff)
[FIX] base_geolocalize, website_crm_partner_assign: API keys are now required
Google Important Updated: API keys are now required We began enforcing the use of API keys, effective June 11th 2018. Keyless usage will result in a degraded experience, or an error. https://developers.google.com/maps/billing/important-updates
Diffstat (limited to 'addons/website_crm_partner_assign')
-rw-r--r--addons/website_crm_partner_assign/models/crm_lead.py17
-rw-r--r--addons/website_crm_partner_assign/tests/test_partner_assign.py2
2 files changed, 5 insertions, 14 deletions
diff --git a/addons/website_crm_partner_assign/models/crm_lead.py b/addons/website_crm_partner_assign/models/crm_lead.py
index 3e7651bbb2a..a927cb37e12 100644
--- a/addons/website_crm_partner_assign/models/crm_lead.py
+++ b/addons/website_crm_partner_assign/models/crm_lead.py
@@ -88,19 +88,10 @@ class CrmLead(models.Model):
if lead.partner_latitude and lead.partner_longitude:
continue
if lead.country_id:
- result = geo_find(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_find(geo_query_address(
- city=lead.city,
- state=lead.state_id.name,
- country=lead.country_id.name
- ))
-
+ apikey = self.env['ir.config_parameter'].sudo().get_param('google.api_key_geocode')
+ result = self.env['res.partner']._geo_localize(apikey,
+ lead.street, lead.zip, lead.city,
+ lead.state_id.name, lead.country_id.name)
if result:
lead.write({
'partner_latitude': result[0],
diff --git a/addons/website_crm_partner_assign/tests/test_partner_assign.py b/addons/website_crm_partner_assign/tests/test_partner_assign.py
index 6bf5e00af76..b3249fd3d7c 100644
--- a/addons/website_crm_partner_assign/tests/test_partner_assign.py
+++ b/addons/website_crm_partner_assign/tests/test_partner_assign.py
@@ -11,7 +11,7 @@ class TestPartnerAssign(TransactionCase):
def setUp(self):
super(TestPartnerAssign, self).setUp()
- def geo_find(addr):
+ def geo_find(addr, apikey):
return {
'Wavre, Belgium': (50.7158956, 4.6128075),
'Cannon Hill Park, B46 3AG Birmingham, United Kingdom': (52.45216, -1.898578),