Merge 076bdc9 into 8b906cc

OCA · Oct 18, 2019 · 236ee08 · 236ee08
2 parents 8b906cc + 076bdc9
commit 236ee08
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 58 deletions.
diff --git a/l10n_br_hr/data/dependent_type_data.xml b/l10n_br_hr/data/dependent_type_data.xml
@@ -1,46 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+        <!-- e-Social Tabela 07 - Tipos de Dependente -->
+        <!-- Fonte: Anexo I dos Leiautes do eSocial versão 2.5 (consolidada até NT 15/2019 rev.) -->
         <record id='l10n_br_dependent_1' model="hr.dependent.type">
             <field name="name">Cônjuge</field>
             <field name="code">1</field>
         </record>
 
         <record id='l10n_br_dependent_2' model="hr.dependent.type">
-            <field name="name">Companheiro(a) com o(a) qual tenha filho ou viva há mais de 5 (cinco) anos</field>
+            <field name="name">Companheiro(a) com o(a) qual tenha filho ou viva há mais de 5 (cinco) anos ou possua Declaração de União Estável</field>
             <field name="code">2</field>
         </record>
 
         <record id='l10n_br_dependent_3' model="hr.dependent.type">
-            <field name="name">Filho(a) ou enteado(a) até 21 (vinte e um) anos</field>
+            <field name="name">Filho(a) ou enteado(a)</field>
             <field name="code">3</field>
         </record>
 
         <record id='l10n_br_dependent_4' model="hr.dependent.type">
-            <field name="name">Filho(a) ou enteado(a) universitário(a) ou cursando escola técnica de 2º grau, até 24 (vinte e quatro) anos</field>
+            <field name="name">Filho(a) ou enteado(a) universitário(a) ou cursando escola técnica de 2º grau</field>
             <field name="code">4</field>
         </record>
 
-        <record id='l10n_br_dependent_5' model="hr.dependent.type">
-            <field name="name">Filho(a) ou enteado(a) em qualquer idade, quando incapacitado física e/ou mentalmente para o trabalho</field>
-            <field name="code">5</field>
-        </record>
-
         <record id='l10n_br_dependent_6' model="hr.dependent.type">
-            <field name="name">Irmão(ã), neto(a) ou bisneto(a) sem arrimo dos pais, do(a) qual detenha a guarda judicial, até 21 (vinte e um) anos</field>
+            <field name="name">Irmão(ã), neto(a) ou bisneto(a) sem arrimo dos pais, do(a) qual detenha a guarda judicial</field>
             <field name="code">6</field>
         </record>
 
         <record id='l10n_br_dependent_7' model="hr.dependent.type">
-            <field name="name">Irmão(ã), neto(a) ou bisneto(a) sem arrimo dos pais, com idade até 24 anos, se ainda estiver cursando estabelecimento de nível superior ou escola técnica de 2º grau, desde que tenha detido sua guarda judicial até os 21 anos</field>
+            <field name="name">Irmão(ã), neto(a) ou bisneto(a) sem arrimo dos pais, universitário(a) ou cursando escola técnica de 2° grau, do(a) qual detenha a guarda judicial</field>
             <field name="code">7</field>
         </record>
 
-        <record id='l10n_br_dependent_8' model="hr.dependent.type">
-            <field name="name">Irmão(ã), neto(a) ou bisneto(a) sem arrimo dos pais, do(a) qual detenha a guarda judicial, em qualquer idade, quando incapacitado física e/ou mentalmente para o trabalho</field>
-            <field name="code">8</field>
-        </record>
-
         <record id='l10n_br_dependent_9_1' model="hr.dependent.type">
             <field name="name">Pai</field>
             <field name="code">9</field>
@@ -57,7 +49,7 @@
         </record>
 
         <record id='l10n_br_dependent_10' model="hr.dependent.type">
-            <field name="name">Menor pobre, até 21 (vinte e um) anos, que crie e eduque e do qual detenha a guarda judicial</field>
+            <field name="name">Menor pobre do qual detenha a guarda judicial</field>
             <field name="code">10</field>
         </record>
 
@@ -67,7 +59,7 @@
         </record>
 
         <record id='l10n_br_dependent_12' model="hr.dependent.type">
-            <field name="name">Ex-cônjuge que Receba Pensão de Alimentos</field>
+            <field name="name">Ex-cônjuge</field>
             <field name="code">12</field>
         </record>
 

diff --git a/l10n_br_hr/models/__init__.py b/l10n_br_hr/models/__init__.py
@@ -9,7 +9,6 @@
 from . import res_company
 from . import res_partner
 from . import hr_employee_dependent
-from . import hr_chronic_disease
 from . import hr_civil_certificate_type
 from .import hr_deficiency
 from . import hr_dependent_type

diff --git a/l10n_br_hr/models/hr_chronic_disease.py b/l10n_br_hr/models/hr_chronic_disease.py
diff --git a/l10n_br_hr/models/hr_employee.py b/l10n_br_hr/models/hr_employee.py
@@ -165,10 +165,6 @@ def _default_country(self):
     alternate_email = fields.Char(
         string='Alternate email')
 
-    chronic_disease_ids = fields.Many2many(
-        string='Chronic Diseases',
-        comodel_name='hr.chronic.disease')
-
     marital = fields.Selection(
         selection_add=[
             ('common_law_marriage', 'Common law marriage'),
@@ -213,9 +209,7 @@ def _check_dependents(self):
 
     def _check_dob(self):
         for dependent in self.dependent_ids:
-            if datetime.strptime(
-                    dependent.dependent_dob, DEFAULT_SERVER_DATE_FORMAT
-            ).date() > datetime.now().date():
+            if dependent.dependent_dob > datetime.now().date():
                 raise ValidationError(_('Invalid birth date for dependent %s')
                                       % dependent.dependent_name)
 

diff --git a/l10n_br_hr/models/hr_employee_dependent.py b/l10n_br_hr/models/hr_employee_dependent.py
@@ -110,3 +110,9 @@ def create(self, vals):
             HrEmployeeDependent, self.sudo().with_context(ctx)
         ).create(vals)
         return patient
+
+    @api.onchange('dependent_cpf')
+    def onchange_cpf(self):
+        cpf = cnpj_cpf.formata(str(self.dependent_cpf))
+        if cpf:
+            self.dependent_cpf = cpf
diff --git a/l10n_br_hr/security/ir.model.access.csv b/l10n_br_hr/security/ir.model.access.csv
@@ -7,8 +7,6 @@ access_hr_identity_type_manager,access_hr_identity_type_manager,model_hr_identit
 access_hr_identity_type,access_hr_identity_type,model_hr_identity_type,,1,0,0,0
 access_hr_civil_certificate_type_manager,access_hr_civil_certificate_type_manager,model_hr_civil_certificate_type,hr.group_hr_manager,1,1,1,1
 access_hr_civil_certificate_type,access_hr_civil_certificate_type,model_hr_civil_certificate_type,,1,0,0,0
-access_hr_chronic_disease_manager,access_hr_chronic_disease_manager,model_hr_chronic_disease,hr.group_hr_manager,1,1,1,1
-access_hr_chronic_disease,access_hr_chronic_disease,model_hr_chronic_disease,,1,0,0,0
 access_hr_dependent_type_manager,access_hr_dependent_type_manager,model_hr_dependent_type,hr.group_hr_manager,1,1,1,1
 access_hr_dependent_type,access_hr_dependent_type,model_hr_dependent_type,,1,0,0,0
 access_hr_ethnicity_manager,access_hr_ethnicity_manager,model_hr_ethnicity,hr.group_hr_manager,1,1,1,1

diff --git a/l10n_br_hr/tests/test_l10n_br_hr.py b/l10n_br_hr/tests/test_l10n_br_hr.py
@@ -15,7 +15,6 @@ def setUp(self):
             'civil_certificate_type_id': self.env['hr.civil.certificate.type'],
             'deficiency_id': 1,
             'deficiency_description': 'Deficiency in index finger',
-            'chronic_disease_ids': 'Cronic',
             'name': 'l10n brazil demo employee',
             'pis_pasep': '496.85994.95-6',
             'cpf': '853.334.271-35',

diff --git a/l10n_br_hr/views/hr_employee_view.xml b/l10n_br_hr/views/hr_employee_view.xml
@@ -103,7 +103,6 @@
                         <field name="blood_type"/>
                         <field name="deficiency_id"/>
                         <field name="deficiency_description"/>
-                        <field name="chronic_disease_ids"/>
                     </group>
                 </page>
             </xpath>
@@ -237,13 +236,6 @@
         <field name="view_mode">tree,form</field>
     </record>
 
-    <record id="action_hr_chronic_disease" model="ir.actions.act_window">
-        <field name="name">Chronic disease</field>
-        <field name="res_model">hr.chronic.disease</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-    </record>
-
     <record id="action_hr_dependent_type" model="ir.actions.act_window">
         <field name="name">Relatedness</field>
         <field name="res_model">hr.dependent.type</field>
@@ -272,18 +264,14 @@
         <field name="view_mode">tree,form</field>
     </record>
 
-    <menuitem id="menu_hr_contract_configuration_rais" parent="hr.menu_human_resources_configuration" name="RAIS" sequence="30" groups="hr.group_hr_manager"/>
-
-    <menuitem id="menu_hr_employee_register" parent="menu_hr_contract_configuration_rais" name="Employee register" sequence="20" groups="hr.group_hr_manager"/>
+    <menuitem id="menu_hr_employee_register" parent="hr.menu_human_resources_configuration" name="Employee register" sequence="20" groups="hr.group_hr_manager"/>
 
     <menuitem action="action_hr_deficiency" id="menu_hr_deficiency" parent="menu_hr_employee_register" sequence="1"/>
 
     <menuitem action="action_hr_identity_type" id="menu_hr_identity_type" parent="menu_hr_employee_register" sequence="2"/>
 
     <menuitem action="action_hr_civil_certificate_type" id="menu_hr_civil_certificate_type" parent="menu_hr_employee_register" sequence="3"/>
 
-    <menuitem action="action_hr_chronic_disease" id="menu_hr_chronic_disease" parent="menu_hr_employee_register" sequence="4"/>
-
     <menuitem action="action_hr_dependent_type" id="menu_hr_dependent_type" parent="menu_hr_employee_register" sequence="5"/>
 
     <menuitem action="action_hr_ethnicity" id="menu_hr_ethnicity" parent="menu_hr_employee_register" sequence="6"/>