Skip to content

Commit

Permalink
Merge 651d7e1 into b9072cd
Browse files Browse the repository at this point in the history
  • Loading branch information
mileo committed Oct 30, 2019
2 parents b9072cd + 651d7e1 commit 0579fbf
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 43 deletions.
2 changes: 1 addition & 1 deletion .pylintrc
Expand Up @@ -84,4 +84,4 @@ enable=anomalous-backslash-in-string,
[REPORTS]
msg-template={path}:{line}: [{msg_id}({symbol}), {obj}] {msg}
output-format=colorized
reports=no
reports=no
2 changes: 1 addition & 1 deletion .pylintrc-mandatory
Expand Up @@ -62,4 +62,4 @@ enable=anomalous-backslash-in-string,
[REPORTS]
msg-template={path}:{line}: [{msg_id}({symbol}), {obj}] {msg}
output-format=colorized
reports=no
reports=no
47 changes: 21 additions & 26 deletions l10n_br_base/__manifest__.py
Expand Up @@ -10,32 +10,27 @@
"website": "http://odoo-brasil.org",
"version": "12.0.1.0.0",
"depends": ["base", "base_setup", "base_address_city", "base_address_extended"],
'data': [
'security/ir.model.access.csv',
'data/res.city.csv',
'data/res.country.state.csv',
'data/res.bank.csv',
'views/webclient_templates.xml',
'views/res_partner_address_view.xml',
'views/res_config_settings_view.xml',
'data/res_country_data.xml',
'views/res_city_view.xml',
'views/res_bank_view.xml',
'views/res_partner_bank_view.xml',
'views/res_country_view.xml',
'views/res_partner_view.xml',
'views/res_company_view.xml'
"data": [
"security/ir.model.access.csv",
"data/res.city.csv",
"data/res.country.state.csv",
"data/res.bank.csv",
"views/webclient_templates.xml",
"views/res_partner_address_view.xml",
"views/res_config_settings_view.xml",
"data/res_country_data.xml",
"views/res_city_view.xml",
"views/res_bank_view.xml",
"views/res_partner_bank_view.xml",
"views/res_country_view.xml",
"views/res_partner_view.xml",
"views/res_company_view.xml",
],
'demo': [
'demo/l10n_br_base_demo.xml',
'demo/res_partner_demo.xml',
'demo/res_company_demo.xml'
"demo": [
"demo/l10n_br_base_demo.xml",
"demo/res_partner_demo.xml",
"demo/res_company_demo.xml",
],
'installable': True,
'external_dependencies': {
'python': [
'num2words',
'erpbrasil.base',
],
}
"installable": True,
"external_dependencies": {"python": ["num2words", "erpbrasil.base"]},
}
21 changes: 6 additions & 15 deletions l10n_br_base/models/res_country.py
@@ -1,25 +1,16 @@
# Copyright (C) 2009 Renato Lima - Akretion
# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html

from odoo import models, fields
from odoo import fields, models


class Country(models.Model):
_inherit = 'res.country'
_inherit = "res.country"

bc_code = fields.Char(
string='BC Code',
size=5)
bc_code = fields.Char(string="BC Code", size=5)

ibge_code = fields.Char(
string='IBGE Code',
size=5)
ibge_code = fields.Char(string="IBGE Code", size=5)

siscomex_code = fields.Char(
string='Siscomex Code',
size=4)
siscomex_code = fields.Char(string="Siscomex Code", size=4)

nationality_code = fields.Char(
string='Nationality Code',
size=2,
)
nationality_code = fields.Char(string="Nationality Code", size=2)

0 comments on commit 0579fbf

Please sign in to comment.