[IMP] Adding base_address_city to dependencies, changing city_id refe…

…rence to core city model

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)
 

br_base/__manifest__.py

@@ -15,7 +15,8 @@
         'Carlos Alberto Cipriano Korovsky <carlos.korovsky@uktech.com.br',
     ],
     'depends': [
-        'br_localization_filtering'
+        'base_address_city',
+        'br_localization_filtering',
     ],
     'external_dependencies': {
         'python': [

br_base/models/br_base.py

@@ -13,13 +13,8 @@ class ResStateCity(models.Model):
     No Brasil é necessário em alguns documentos fiscais informar o código
     do IBGE dos município envolvidos da transação.
     """
-    _name = 'res.state.city'
-    _description = u'City'
+    _inherit = 'res.city'
 
-    name = fields.Char(string='Name', size=64, required=True)
-    state_id = fields.Many2one(comodel_name='res.country.state',
-                               string='State',
-                               required=True)
     l10n_br_ibge_code = fields.Char(
         string='IBGE Code', size=7, copy=False, oldname="ibge_code")
 
@@ -28,5 +23,5 @@ class ResRegion(models.Model):
     _name = 'res.region'
 
     name = fields.Char(string="Name", size=100)
-    city_ids = fields.Many2many('res.state.city', string="Cities")
+    city_ids = fields.Many2many('res.city', string="Cities")
     state_ids = fields.Many2many('res.country.state', string="States")

br_base/models/res_bank.py

@@ -17,7 +17,7 @@ class ResBank(models.Model):
     l10n_br_number = fields.Char(u'Number', size=10, oldname='number')
     street2 = fields.Char('Complement', size=128)
     l10n_br_district = fields.Char('District', size=32, oldname='district')
-    city_id = fields.Many2one(comodel_name='res.state.city',
+    city_id = fields.Many2one(comodel_name='res.city',
                               string=u'City',
                               domain="[('state_id','=',state_id)]")
 

br_base/models/res_company.py

@@ -127,7 +127,7 @@ def _compute_expiry_date(self):
 
     city_id = fields.Many2one(
         compute=_get_address_data, inverse='_set_city_id',
-        comodel_name='res.state.city', string="City", multi='address')
+        comodel_name='res.city', string="City", multi='address')
 
     l10n_br_district = fields.Char(
         compute=_get_address_data, inverse='_set_br_district', size=32,

br_base/models/res_partner.py

@@ -38,10 +38,10 @@ class ResPartner(models.Model):
                                     oldname='inscr_mun')
     l10n_br_suframa = fields.Char('Suframa', size=18, oldname='suframa')
     l10n_br_legal_name = fields.Char(
-        u'Legal Name', size=60, help="Name used in fiscal documents",
+        'Legal Name', size=60, help="Name used in fiscal documents",
         oldname='legal_name')
     city_id = fields.Many2one(
-        'res.state.city', u'City',
+        'res.city', 'City',
         domain="[('state_id','=',state_id)]")
     l10n_br_district = fields.Char('District', size=32, oldname='district')
     l10n_br_number = fields.Char(u'Number', size=10, oldname='number')
@@ -237,11 +237,11 @@ def get_value(obj, prop):
                 xMun = get_value(info.infCad.ender, 'xMun')
                 city = None
                 if cMun:
-                    city = self.env['res.state.city'].search(
+                    city = self.env['res.city'].search(
                         [('l10n_br_ibge_code', '=', str(cMun)[2:]),
                          ('state_id', '=', self.state_id.id)])
                 if not city and xMun:
-                    city = self.env['res.state.city'].search(
+                    city = self.env['res.city'].search(
                         [('name', 'ilike', xMun),
                          ('state_id', '=', self.state_id.id)])
                 if city:

br_base/security/ir.model.access.csv

@@ -1,3 +1,2 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"res_state_city","res.state.city","model_res_state_city","base.group_partner_manager",1,1,1,1
 "res_region","res.region","model_res_region","base.group_partner_manager",1,1,1,1

br_base/views/br_base_view.xml

@@ -6,24 +6,26 @@
     </record>
 
     <record id="view_br_base_city_tree" model="ir.ui.view">
-        <field name="name">l10n_br_base.res.state.city</field>
-        <field name="model">res.state.city</field>
+        <field name="name">l10n_br_base.res.city</field>
+        <field name="model">res.city</field>
+        <field name="inherit_id" ref="base_address_city.view_city_tree" />
         <field name="arch" type="xml">
-            <tree string="Cities">
-                <field name="name" select="1"/>
-                <field name="state_id" select="1"/>
+            <field name="state_id" position="after">
                 <field name="l10n_br_ibge_code"/>
-            </tree>
+            </field>
         </field>
     </record>
 
     <record id="action_br_base_city_form" model="ir.actions.act_window">
         <field name="name">City</field>
         <field name="type">ir.actions.act_window</field>
-        <field name="res_model">res.state.city</field>
+        <field name="res_model">res.city</field>
         <field name="view_mode">tree,form</field>
         <field name="view_type">form</field>
         <field name="view_id" ref="view_br_base_city_tree"/>
     </record>
 
+    <menuitem id="menu_action_br_base_city_form" name="Municípios"
+        parent="contacts.menu_localisation" action="br_base.action_br_base_city_form"/>
+
 </odoo>

br_crm/models/crm_lead.py

@@ -18,7 +18,7 @@ class CrmLead(models.Model):
     inscr_est = fields.Char(u'Inscrição Estadual', size=16)
     inscr_mun = fields.Char(u'Inscrição Municipal', size=18)
     suframa = fields.Char('Suframa', size=18)
-    city_id = fields.Many2one('res.state.city', u'Município',
+    city_id = fields.Many2one('res.city', u'Município',
                               domain="[('state_id','=',state_id)]")
     l10n_br_district = fields.Char('Bairro', size=32, oldname="district")
     number = fields.Char(u'Número', size=10)

br_delivery/models/br_delivery.py

@@ -20,7 +20,7 @@ class BrDeliveryCarrierVehicle(models.Model):
         'res.country.state', u'Estado',
         domain="[('country_id', '=', country_id)]")
     city_id = fields.Many2one(
-        'res.state.city', u'Município',
+        'res.city', u'Município',
         domain="[('state_id','=',state_id)]")
     active = fields.Boolean(u'Ativo')
     manufacture_year = fields.Char(u'Ano de Fabricação', size=4)

br_localization_filtering/models/br_localization_filtering.py

@@ -23,6 +23,8 @@ def _get_br_localization_template(self):
             tmpl_id3 and tmpl_id3.id or False] if x]
 
     def _get_user_localization(self):
+        if not hasattr(self.env.user.company_id, 'chart_template_id'):
+            return False
         user_localization = self.env.user.company_id.chart_template_id
         return user_localization and user_localization.id or False
 
@@ -98,6 +100,8 @@ def _compute_is_br_localization(self):
         user_template = self._get_user_localization()
         for record in self:
             if hasattr(record, 'company_id'):
+                if not hasattr(record.company_id, 'chart_template_id'):
+                    continue
                 user_template = (record.company_id.chart_template_id
                                  and record.company_id.chart_template_id.id
                                  or user_template)

br_sale/views/br_sale.xml

@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <menuitem id="menu_action_br_base_city_form" name="Municípios"
-        parent="contacts.menu_localisation" action="br_base.action_br_base_city_form"/>
-
     <menuitem id="menu_action_br_base_res_region_form" name="Regiões"
         parent="contacts.menu_localisation" action="br_base.action_br_base_res_region_form"/>
 

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 []

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'])])
 

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)