audrius/suite
1
0
Fork 1
mirror of https://gitlab.com/hibou-io/hibou-odoo/suite.git synced 2025-01-20 12:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

#63 Migrate to new API.

Browse Source
This commit is contained in:
Jared Kipe
2018-12-30 09:40:32 -08:00
parent c334bc357f
commit 772f8a738b
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
l10n_us_partner_zipcode/res_partner.py
View File

@@ -3,10 +3,10 @@ import logging
_logger = logging.getLogger(__name__) _logger = logging.getLogger(__name__)
try: try:
from uszipcode import ZipcodeSearchEngine from uszipcode import SearchEngine
except ImportError: except ImportError:
_logger.warn('module "uszipcode" cannot be loaded, you will be unable to detect Cities and States by ZIP') _logger.warn('module "uszipcode" cannot be loaded, you will be unable to detect Cities and States by ZIP')
ZipcodeSearchEngine = None SearchEngine = None
from odoo import api, fields, models from odoo import api, fields, models
@@ -16,24 +16,24 @@ class Partner(models.Model):
@api.onchange('zip') @api.onchange('zip')
def _zip_to_city_state(self): def _zip_to_city_state(self):
if ZipcodeSearchEngine and self.zip and not self.city: if SearchEngine and self.zip and not self.city:
country_us = self.env['res.country'].search([('code', '=', 'US')], limit=1) country_us = self.env['res.country'].search([('code', '=', 'US')], limit=1)
state_obj = self.env['res.country.state'] state_obj = self.env['res.country.state']
if not self.country_id or self.country_id.id == country_us.id: if not self.country_id or self.country_id.id == country_us.id:
with ZipcodeSearchEngine() as search: with SearchEngine() as search:
zipcode = search.by_zipcode(self.zip) zipcode = search.by_zipcode(self.zip)
if zipcode: if zipcode:
if not self.country_id: if not self.country_id:
self.country_id = country_us self.country_id = country_us
self.city = zipcode['City'] self.city = zipcode.city
self.state_id = state_obj.search([ self.state_id = state_obj.search([
('code', '=', zipcode['State']), ('code', '=', zipcode.state),
('country_id', '=', country_us.id), ('country_id', '=', country_us.id),
], limit=1) ], limit=1)
if hasattr(self, 'partner_latitude') and not self.partner_latitude: if hasattr(self, 'partner_latitude') and not self.partner_latitude:
self.partner_latitude = zipcode['Latitude'] self.partner_latitude = zipcode.lat
self.partner_longitude = zipcode['Longitude'] self.partner_longitude = zipcode.lng
self.date_localization = fields.Date.context_today(self) self.date_localization = fields.Date.context_today(self)
return {} return {}

14
sale_planner/models/partner.py
View File

@@ -1,9 +1,9 @@
from odoo import api, fields, models from odoo import api, fields, models
try: try:
from uszipcode import ZipcodeSearchEngine from uszipcode import SearchEngine
except ImportError: except ImportError:
ZipcodeSearchEngine = None SearchEngine = None
class Partner(models.Model): class Partner(models.Model):
@@ -13,13 +13,13 @@ class Partner(models.Model):
def geo_localize(self): def geo_localize(self):
# We need country names in English below # We need country names in English below
for partner in self.with_context(lang='en_US'): for partner in self.with_context(lang='en_US'):
if ZipcodeSearchEngine and partner.zip: if SearchEngine and partner.zip:
with ZipcodeSearchEngine() as search: with SearchEngine() as search:
zipcode = search.by_zipcode(str(self.zip).split('-')[0]) zipcode = search.by_zipcode(str(self.zip).split('-')[0])
if zipcode and zipcode['Latitude']: if zipcode and zipcode.lat:
partner.write({ partner.write({
'partner_latitude': zipcode['Latitude'], 'partner_latitude': zipcode.lat,
'partner_longitude': zipcode['Longitude'], 'partner_longitude': zipcode.lng,
'date_localization': fields.Date.context_today(partner), 'date_localization': fields.Date.context_today(partner),
}) })
else: else:

14
sale_planner/wizard/order_planner.py
View File

@@ -8,10 +8,10 @@ from logging import getLogger
_logger = getLogger(__name__) _logger = getLogger(__name__)
try: try:
from uszipcode import ZipcodeSearchEngine from uszipcode import SearchEngine
except ImportError: except ImportError:
_logger.warn('module "uszipcode" cannot be loaded, falling back to Google API') _logger.warn('module "uszipcode" cannot be loaded, falling back to Google API')
ZipcodeSearchEngine = None SearchEngine = None
from odoo import api, fields, models, tools from odoo import api, fields, models, tools
from odoo.addons.base_geolocalize.models.res_partner import geo_find, geo_query_address from odoo.addons.base_geolocalize.models.res_partner import geo_find, geo_query_address
@@ -58,12 +58,12 @@ class FakePartner():
if not hasattr(self, 'date_localization') and self.date_localization: if not hasattr(self, 'date_localization') and self.date_localization:
self.date_localization = 'TODAY!' self.date_localization = 'TODAY!'
# The fast way. # The fast way.
if ZipcodeSearchEngine and self.zip: if SearchEngine and self.zip:
with ZipcodeSearchEngine() as search: with SearchEngine() as search:
zipcode = search.by_zipcode(str(self.zip).split('-')[0]) zipcode = search.by_zipcode(str(self.zip).split('-')[0])
if zipcode and zipcode['Latitude']: if zipcode and zipcode.lat:
self.partner_latitude = zipcode['Latitude'] self.partner_latitude = zipcode.lat
self.partner_longitude = zipcode['Longitude'] self.partner_longitude = zipcode.lng
return self.date_localization return self.date_localization
# The slow way. # The slow way.