From 53066f232b468399f543c2994d7ae1d8b8fb8957 Mon Sep 17 00:00:00 2001 From: Danimar Ribeiro Date: Tue, 30 Oct 2018 16:02:40 -0300 Subject: [PATCH] [IMP] Adding base_address_city to dependencies, changing city_id reference to core city model --- br_base/__init__.py | 2 +- br_base/__manifest__.py | 3 +- br_base/data/res.city.csv | 11130 ++++++++-------- br_base/data/res.state.city.csv | 5565 -------- br_base/models/br_base.py | 9 +- br_base/models/res_bank.py | 2 +- br_base/models/res_company.py | 2 +- br_base/models/res_partner.py | 8 +- br_base/security/ir.model.access.csv | 1 - br_base/views/br_base_view.xml | 16 +- br_crm/models/crm_lead.py | 2 +- br_delivery/models/br_delivery.py | 2 +- .../models/br_localization_filtering.py | 4 + br_sale/views/br_sale.xml | 3 - br_website_sale/controllers/main.py | 2 +- br_zip/models/br_zip.py | 8 +- br_zip/wizard/br_zip_search.py | 4 +- 17 files changed, 5598 insertions(+), 11165 deletions(-) delete mode 100644 br_base/data/res.state.city.csv diff --git a/br_base/__init__.py b/br_base/__init__.py index f4b063047..15ca92e83 100644 --- a/br_base/__init__.py +++ b/br_base/__init__.py @@ -11,7 +11,7 @@ def post_init(cr, registry): """Import CSV data as it is faster than xml and because we can't use noupdate anymore with csv""" from odoo.tools import convert_file - filename = 'data/res.state.city.csv' + filename = 'data/res.city.csv' convert_file(cr, 'br_base', filename, None, mode='init', noupdate=True, kind='init', report=None) diff --git a/br_base/__manifest__.py b/br_base/__manifest__.py index 1b6d667fe..60934a6be 100644 --- a/br_base/__manifest__.py +++ b/br_base/__manifest__.py @@ -15,7 +15,8 @@ 'Carlos Alberto Cipriano Korovsky - - diff --git a/br_website_sale/controllers/main.py b/br_website_sale/controllers/main.py index d2b94d2f9..b11516331 100644 --- a/br_website_sale/controllers/main.py +++ b/br_website_sale/controllers/main.py @@ -29,7 +29,7 @@ def _get_mandatory_shipping_fields(self): methods=['POST'], website=True) def get_cities_json(self, state_id): if state_id and state_id.isdigit(): - cities = request.env['res.state.city'].sudo().search( + cities = request.env['res.city'].sudo().search( [('state_id', '=', int(state_id))]) return [(city.id, city.name) for city in cities] return [] diff --git a/br_zip/models/br_zip.py b/br_zip/models/br_zip.py index d623b4e9b..d9f689cd4 100644 --- a/br_zip/models/br_zip.py +++ b/br_zip/models/br_zip.py @@ -28,7 +28,7 @@ class BrZip(models.Model): 'res.country.state', 'Estado', domain="[('country_id','=',country_id)]") city_id = fields.Many2one( - 'res.state.city', 'Cidade', + 'res.city', 'Cidade', required=True, domain="[('state_id','=',state_id)]") def set_domain(self, country_id=False, state_id=False, @@ -107,7 +107,7 @@ def _search_by_cep(self, zip_code): obj_viacep = requests.get(url_viacep) res = obj_viacep.json() if not res.get('erro', False): - city = self.env['res.state.city'].search( + city = self.env['res.city'].search( [('l10n_br_ibge_code', '=', res['ibge'][2:]), ('state_id.code', '=', res['uf'])]) @@ -124,14 +124,14 @@ def _search_by_cep(self, zip_code): def _search_by_address(self, state_id, city_id, street): try: - city = self.env['res.state.city'].browse(city_id) + city = self.env['res.city'].browse(city_id) url_viacep = 'http://viacep.com.br/ws/' + city.state_id.code + \ '/' + city.name + '/' + street + '/json/unicode/' obj_viacep = requests.get(url_viacep) results = obj_viacep.json() if results: for res in results: - city = self.env['res.state.city'].search( + city = self.env['res.city'].search( [('l10n_br_ibge_code', '=', res['ibge'][2:]), ('state_id.code', '=', res['uf'])]) diff --git a/br_zip/wizard/br_zip_search.py b/br_zip/wizard/br_zip_search.py index 44371ee14..3d1e8e116 100644 --- a/br_zip/wizard/br_zip_search.py +++ b/br_zip/wizard/br_zip_search.py @@ -16,7 +16,7 @@ class BrZipSearch(models.TransientModel): country_id = fields.Many2one('res.country', u'País') state_id = fields.Many2one("res.country.state", 'Estado', domain="[('country_id','=',country_id)]") - city_id = fields.Many2one('res.state.city', 'Cidade', + city_id = fields.Many2one('res.city', 'Cidade', domain="[('state_id','=',state_id)]") zip_ids = fields.Many2many('br.zip.result', 'zip_search', 'zip_search_id', 'zip_id', 'CEP', readonly=False) @@ -113,7 +113,7 @@ class BrZipResult(models.TransientModel): state_id = fields.Many2one('res.country.state', 'Estado', domain="[('country_id', '=', country_id)]", readonly=True) - city_id = fields.Many2one('res.state.city', 'Cidade', required=True, + city_id = fields.Many2one('res.city', 'Cidade', required=True, domain="[('state_id', '=', state_id)]", readonly=True)