Merge branch '11.0' into 11.0-br_account_close_traducao

Trust-Code · Apr 17, 2018 · 9a2e583 · 9a2e583
2 parents 181d5dc + 0f09752
commit 9a2e583
Show file tree

Hide file tree

Showing 12 changed files with 571 additions and 94 deletions.
diff --git a/br_base/i18n/pt_BR.po b/br_base/i18n/pt_BR.po
diff --git a/br_base/models/br_base.py b/br_base/models/br_base.py
@@ -14,18 +14,18 @@ class ResStateCity(models.Model):
     do IBGE dos município envolvidos da transação.
     """
     _name = 'res.state.city'
-    _description = u'Município'
+    _description = u'City'
 
-    name = fields.Char(string='Nome', size=64, required=True)
+    name = fields.Char(string='Name', size=64, required=True)
     state_id = fields.Many2one(comodel_name='res.country.state',
-                               string='Estado',
+                               string='State',
                                required=True)
-    ibge_code = fields.Char(string=u'Código IBGE', size=7, copy=False)
+    ibge_code = fields.Char(string=u'IBGE Code', size=7, copy=False)
 
 
 class ResRegion(models.Model):
     _name = 'res.region'
 
-    name = fields.Char(string="Nome", size=100)
-    city_ids = fields.Many2many('res.state.city', string="Cidades")
-    state_ids = fields.Many2many('res.country.state', string="Estados")
+    name = fields.Char(string="Name", size=100)
+    city_ids = fields.Many2many('res.state.city', string="Cities")
+    state_ids = fields.Many2many('res.country.state', string="States")
diff --git a/br_base/models/res_bank.py b/br_base/models/res_bank.py
@@ -13,19 +13,19 @@
 class ResBank(models.Model):
     _inherit = 'res.bank'
 
-    number = fields.Char(u'Número', size=10)
-    street2 = fields.Char('Complemento', size=128)
-    district = fields.Char('Bairro', size=32)
+    number = fields.Char(u'Number', size=10)
+    street2 = fields.Char('Complement', size=128)
+    district = fields.Char('District', size=32)
     city_id = fields.Many2one(comodel_name='res.state.city',
-                              string=u'Município',
+                              string=u'City',
                               domain="[('state_id','=',state_id)]")
 
     country_id = fields.Many2one(comodel_name='res.country',
                                  related='country',
-                                 string=u'País')
+                                 string=u'Country')
     state_id = fields.Many2one(comodel_name='res.country.state',
                                related='state',
-                               string='Estado')
+                               string='State')
 
     acc_number_format = fields.Text(help="""You can enter here the format as\
     the bank accounts are referenced in ofx files for the import of bank\
@@ -56,9 +56,9 @@ class ResPartnerBank(models.Model):
     _inherit = 'res.partner.bank'
 
     acc_number = fields.Char('Account Number', size=64, required=False)
-    acc_number_dig = fields.Char(u'Digito Conta', size=8)
-    bra_number = fields.Char(u'Agência', size=8)
-    bra_number_dig = fields.Char(u'Dígito Agência', size=8)
+    acc_number_dig = fields.Char(u'Account Number Digit', size=8)
+    bra_number = fields.Char(u'Agency', size=8)
+    bra_number_dig = fields.Char(u'Account Agency Digit', size=8)
 
     @api.depends('bank_id', 'acc_number', 'acc_number_dig',
                  'bra_number', 'bra_number_dig')

diff --git a/br_base/models/res_company.py b/br_base/models/res_company.py
@@ -11,7 +11,7 @@
 import logging
 import base64
 from datetime import datetime
-from odoo import models, fields, api
+from odoo import models, fields, api, _
 
 _logger = logging.getLogger(__name__)
 
@@ -102,55 +102,56 @@ def _compute_expiry_date(self):
         except:
             self.cert_state = 'unknown'
             _logger.warning(
-                u'Erro desconhecido ao consultar certificado', exc_info=True)
+                _(u'Unknown error when validating certificate'),
+                exc_info=True)
 
     cnpj_cpf = fields.Char(
         compute=_get_br_data, inverse=_set_br_cnpj_cpf, size=18,
         string=u'CNPJ')
 
     inscr_est = fields.Char(
         compute=_get_br_data, inverse=_set_br_inscr_est, size=16,
-        string=u'Inscr. Estadual')
+        string=u'State Inscription')
 
     inscr_mun = fields.Char(
         compute=_get_br_data, inverse=_set_br_inscr_mun, size=18,
-        string=u'Inscr. Municipal')
+        string=u'Municipal Inscription')
 
     suframa = fields.Char(
         compute=_get_br_data, inverse=_set_br_suframa, size=18,
         string=u'Suframa')
 
     legal_name = fields.Char(
         compute=_get_br_data, inverse=_set_br_legal_name, size=128,
-        string=u'Razão Social')
+        string=u'Legal Name')
 
     city_id = fields.Many2one(
         compute=_get_address_data, inverse='_set_city_id',
         comodel_name='res.state.city', string="City", multi='address')
 
     district = fields.Char(
         compute=_get_address_data, inverse='_set_br_district', size=32,
-        string=u"Bairro", multi='address')
+        string=u"District", multi='address')
 
     number = fields.Char(
         compute=_get_address_data, inverse='_set_br_number', size=10,
-        string=u"Número", multi='address')
+        string=u"Number", multi='address')
 
-    nfe_a1_file = fields.Binary(u'Arquivo NFe A1')
-    nfe_a1_password = fields.Char(u'Senha NFe A1', size=64)
+    nfe_a1_file = fields.Binary(u'NFe A1 File')
+    nfe_a1_password = fields.Char(u'NFe A1 Password', size=64)
 
     cert_state = fields.Selection(
-        [('not_loaded', u'Não carregado'),
-         ('expired', u'Expirado'),
-         ('invalid_password', u'Senha Inválida'),
-         ('unknown', u'Desconhecido'),
-         ('valid', u'Válido')],
-        string=u"Situação Cert.", compute=_compute_expiry_date,
+        [('not_loaded', u'Not loaded'),
+         ('expired', u'Expired'),
+         ('invalid_password', u'Invalid Password'),
+         ('unknown', u'Unknown'),
+         ('valid', u'Valid')],
+        string=u"Cert. State", compute=_compute_expiry_date,
         default='not_loaded')
     cert_information = fields.Text(
-        string=u"Informações Cert.", compute=_compute_expiry_date)
+        string=u"Cert. Info", compute=_compute_expiry_date)
     cert_expire_date = fields.Date(
-        string=u"Validade Cert.", compute=_compute_expiry_date)
+        string=u"Cert. Expiration Date", compute=_compute_expiry_date)
 
     @api.onchange('cnpj_cpf')
     def onchange_mask_cnpj_cpf(self):

diff --git a/br_base/models/res_country.py b/br_base/models/res_country.py
@@ -9,12 +9,12 @@
 class ResCountry(models.Model):
     _inherit = 'res.country'
 
-    bc_code = fields.Char(u'Código BC', size=5)
-    ibge_code = fields.Char(u'Código IBGE', size=5)
-    siscomex_code = fields.Char(u'Código Siscomex', size=4)
+    bc_code = fields.Char(u'BC Code', size=5)
+    ibge_code = fields.Char(u'IBGE Code', size=5)
+    siscomex_code = fields.Char(u'Siscomex Code', size=4)
 
 
 class ResCountryState(models.Model):
     _inherit = 'res.country.state'
 
-    ibge_code = fields.Char(u'Código IBGE', size=2)
+    ibge_code = fields.Char(u'IBGE Code', size=2)
diff --git a/br_base/models/res_partner.py b/br_base/models/res_partner.py
@@ -28,21 +28,21 @@ class ResPartner(models.Model):
     _inherit = 'res.partner'
 
     cnpj_cpf = fields.Char('CNPJ/CPF', size=18, copy=False)
-    inscr_est = fields.Char('Inscr. Estadual', size=16, copy=False)
+    inscr_est = fields.Char('State Inscription', size=16, copy=False)
     rg_fisica = fields.Char('RG', size=16, copy=False)
-    inscr_mun = fields.Char('Inscr. Municipal', size=18)
+    inscr_mun = fields.Char('Municipal Inscription', size=18)
     suframa = fields.Char('Suframa', size=18)
     legal_name = fields.Char(
-        u'Razão Social', size=60, help="Nome utilizado em documentos fiscais")
+        u'Legal Name', size=60, help="Name used in fiscal documents")
     city_id = fields.Many2one(
-        'res.state.city', u'Município',
+        'res.state.city', u'City',
         domain="[('state_id','=',state_id)]")
-    district = fields.Char('Bairro', size=32)
-    number = fields.Char(u'Número', size=10)
+    district = fields.Char('District', size=32)
+    number = fields.Char(u'Number', size=10)
 
     _sql_constraints = [
         ('res_partner_cnpj_cpf_uniq', 'unique (cnpj_cpf)',
-         u'Já existe um parceiro cadastrado com este CPF/CNPJ!')
+         _(u'This CPF/CNPJ number is already being used by another partner!'))
     ]
 
     @api.v8
@@ -88,9 +88,9 @@ def _check_cnpj_cpf(self):
             if item.cnpj_cpf and country_code.upper() == 'BR':
                 if item.is_company:
                     if not fiscal.validate_cnpj(item.cnpj_cpf):
-                        raise UserError(_(u'CNPJ inválido!'))
+                        raise UserError(_(u'Invalid CNPJ Number!'))
                 elif not fiscal.validate_cpf(item.cnpj_cpf):
-                    raise UserError(_(u'CPF inválido!'))
+                    raise UserError(_(u'Invalid CPF Number!'))
         return True
 
     def _validate_ie_param(self, uf, inscr_est):
@@ -120,7 +120,7 @@ def _check_ie(self):
         uf = self.state_id and self.state_id.code.lower() or ''
         res = self._validate_ie_param(uf, self.inscr_est)
         if not res:
-            raise UserError(_(u'Inscrição Estadual inválida!'))
+            raise UserError(_(u'Invalid State Inscription!'))
         return True
 
     @api.one
@@ -134,8 +134,8 @@ def _check_ie_duplicated(self):
             ['&', ('inscr_est', '=', self.inscr_est), ('id', '!=', self.id)])
 
         if len(partner_ids) > 0:
-            raise UserError(_(u'Já existe um parceiro cadastrado com'
-                            u'esta Inscrição Estadual/RG!'))
+            raise UserError(_(u'This State Inscription/RG number '
+                              u'is already being used by another partner!'))
         return True
 
     @api.onchange('cnpj_cpf')
@@ -152,7 +152,7 @@ def _onchange_cnpj_cpf(self):
                     % (val[0:3], val[3:6], val[6:9], val[9:11])
                 self.cnpj_cpf = cnpj_cpf
             else:
-                raise UserError(_(u'Verifique o CNPJ/CPF'))
+                raise UserError(_(u'Verify CNPJ/CPF number'))
 
     @api.onchange('city_id')
     def _onchange_city_id(self):
@@ -184,13 +184,14 @@ def _address_fields(self):
     def action_check_sefaz(self):
         if self.cnpj_cpf and self.state_id:
             if self.state_id.code == 'AL':
-                raise UserError(u'Alagoas não possui consulta de cadastro')
+                raise UserError(_(u'Alagoas doesn\'t have this service'))
             if self.state_id.code == 'RJ':
-                raise UserError(
-                    u'Rio de Janeiro não possui consulta de cadastro')
+                raise UserError(_(
+                    u'Rio de Janeiro doesn\'t have this service'))
             company = self.env.user.company_id
             if not company.nfe_a1_file and not company.nfe_a1_password:
-                raise UserError(u'Configurar o certificado e senha na empresa')
+                raise UserError(_(
+                    u'Configure the company\'s certificate and password'))
             cert = company.with_context({'bin_size': False}).nfe_a1_file
             cert_pfx = base64.decodestring(cert)
             certificado = Certificado(cert_pfx, company.nfe_a1_password)
@@ -239,7 +240,8 @@ def get_value(obj, prop):
                     msg = "%s - %s" % (info.cStat, info.xMotivo)
                     raise UserError(msg)
             else:
-                raise UserError(u"Nenhuma resposta - verificou se seu \
-                                certificado é válido?")
+                raise UserError(_(
+                    u"No answer - did you verify if your "
+                    u"certificate is valid?"))
         else:
-            raise UserError(u'Preencha o estado e o CNPJ para pesquisar')
+            raise UserError(_(u'Fill the State and CNPJ fields to search'))
diff --git a/br_base/views/br_base.xml b/br_base/views/br_base.xml
@@ -13,7 +13,7 @@
      <template id="trust_menu_secondary" name="" inherit_id="web.menu_secondary">
          <xpath expr="div[hasclass('o_sub_menu_footer')]" position="inside">
              <div class="oe_footer" style="float:left;width:100%;">
-                 Suporte via <a href="http://www.trustcode.com.br" target="_blank"><span style="color:#5F9EA0">Trustcode</span></a>
+                 Support via <a href="http://www.trustcode.com.br" target="_blank"><span style="color:#5F9EA0">Trustcode</span></a>
              </div>
          </xpath>
      </template>

diff --git a/br_base/views/br_base_view.xml b/br_base/views/br_base_view.xml
@@ -9,7 +9,7 @@
         <field name="name">l10n_br_base.res.state.city</field>
         <field name="model">res.state.city</field>
         <field name="arch" type="xml">
-            <tree string="Municípios">
+            <tree string="Cities">
                 <field name="name" select="1"/>
                 <field name="state_id" select="1"/>
                 <field name="ibge_code"/>
@@ -18,7 +18,7 @@
     </record>
 
     <record id="action_br_base_city_form" model="ir.actions.act_window">
-        <field name="name">Município</field>
+        <field name="name">City</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">res.state.city</field>
         <field name="view_mode">tree,form</field>

diff --git a/br_base/views/res_bank_view.xml b/br_base/views/res_bank_view.xml
@@ -9,14 +9,14 @@
             <field name="street2" position="replace"/>
                <field name="zip" position="replace"/>
                <field name="street" position="replace">
-                   <field name="zip" placeholder="CEP" style="width:50%" />
-                   <field name="street" placeholder="Logradouro" />
-                   <field name="number" placeholder="Número"/>
-                   <field name="street2" placeholder="Complemento"/>
-                   <field name="district" placeholder="Bairro"/>
-                   <field name="country_id" placeholder="País" options="{'no_create': True, 'no_create_edit': True}" />
-                   <field name="state_id" placeholder="Estado" options="{'no_create': True, 'no_create_edit': True}" />
-                   <field name="city_id" placeholder="Cidade" options="{'no_create': True, 'no_create_edit': True}" />
+                   <field name="zip" placeholder="Zip Code" style="width:50%" />
+                   <field name="street" placeholder="Street" />
+                   <field name="number" placeholder="Number"/>
+                   <field name="street2" placeholder="Complement"/>
+                   <field name="district" placeholder="District"/>
+                   <field name="country_id" placeholder="Country" options="{'no_create': True, 'no_create_edit': True}" />
+                   <field name="state_id" placeholder="State" options="{'no_create': True, 'no_create_edit': True}" />
+                   <field name="city_id" placeholder="City" options="{'no_create': True, 'no_create_edit': True}" />
                </field>
                <field name="state_id" position="attributes">
                    <attribute name="domain">[('country_id','=',country_id)]</attribute>

diff --git a/br_base/views/res_company_view.xml b/br_base/views/res_company_view.xml
@@ -8,41 +8,41 @@
             <xpath expr="//div[hasclass('oe_title')]/h1" position="after">
                 <label for="legal_name" class="oe_edit_only"/>
                 <h3>
-                    <field name="legal_name" placeholder="Razão Social"/>
+                    <field name="legal_name" placeholder="Legal Name"/>
                 </h3>
             </xpath>
             <field name="street2" position="replace"/>
             <field name="zip" position="replace"/>
             <field name="street" position="replace">
-                <field name="zip" placeholder="CEP" class="o_address_zip" />
-                <field name="street" placeholder="Logradouro" class="o_address_street" />
-                <field name="number" placeholder="Número" class="o_address_city"/>
-                <field name="street2" placeholder="Complemento" class="o_address_street" />
-                <field name="district" placeholder="Bairro" class="o_address_state" />
+                <field name="zip" placeholder="Zip Code" class="o_address_zip" />
+                <field name="street" placeholder="Street" class="o_address_street" />
+                <field name="number" placeholder="Number" class="o_address_city"/>
+                <field name="street2" placeholder="Complement" class="o_address_street" />
+                <field name="district" placeholder="District" class="o_address_state" />
             </field>
             <field name="state_id" position="attributes">
                 <attribute name="domain">[('country_id','=',country_id)]</attribute>
                 <attribute name="options">{'no_create': True, 'no_create_edit': True}</attribute>
             </field>
             <field name="country_id" position="replace"/>
             <field name="state_id" position="before">
-                <field name="country_id" placeholder="País" class="o_address_country"
+                <field name="country_id" placeholder="Country" class="o_address_country"
                     options="{'no_create': True, 'no_create_edit': True}" />
             </field>
             <field name="state_id" position="after">
-                <field name="city_id" placeholder="Cidade" options="{'no_create': True, 'no_create_edit': True}"/>
+                <field name="city_id" placeholder="City" options="{'no_create': True, 'no_create_edit': True}"/>
             </field>
             <field name="city" position="replace">
                 <field name="city" invisible="1"/>
             </field>
             <field name="company_registry" position="after">
                 <field name="cnpj_cpf" placeholder="CNPJ"/>
-                <field name="inscr_est" placeholder="Inscr. Estadual"/>
-                <field name="inscr_mun" placeholder="Inscr. Municipal"/>
+                <field name="inscr_est" placeholder="State Inscription"/>
+                <field name="inscr_mun" placeholder="Municipal Inscription"/>
                 <field name="suframa" placeholder="Suframa"/>
             </field>
             <group position="inside">
-                <group string="Certificado Digital">
+                <group string="Digital Certificate">
                     <field name="nfe_a1_file" />
                     <field name="nfe_a1_password" password="True" />
                     <field name="cert_state" />

diff --git a/br_base/views/res_country_view.xml b/br_base/views/res_country_view.xml
@@ -51,7 +51,7 @@
     </record>
 
     <record id="action_br_base_res_region_form" model="ir.actions.act_window">
-        <field name="name">Regiões</field>
+        <field name="name">Regions</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">res.region</field>
         <field name="view_mode">tree,form</field>