Merge pull request #24 from kmee/develop

Sincronização do desenvolvimento
odoo-brazil · Feb 22, 2017 · 0763841 · 0763841
2 parents bbb5611 + 4af2ee1
commit 0763841
Show file tree

Hide file tree

Showing 47 changed files with 3,519 additions and 761 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,8 +20,12 @@ virtualenv:
 install:
   - git clone https://github.com/OCA/maintainer-quality-tools.git ${HOME}/maintainer-quality-tools
   - export PATH=${HOME}/maintainer-quality-tools/travis:${PATH}
+  - pip install -U pip wheel
   - pip install unidecode
-  - pip install https://github.com/aricaldeira/pybrasil/archive/master.zip
+  - pip install python-dateutil
+  - pip install pytz
+  - pip install pyparsing
+  - pip install git+https://github.com/aricaldeira/pybrasil.git
   - travis_install_nightly
 
 script:

diff --git a/l10n_br_hr_holiday/i18n/pt_BR.po b/l10n_br_hr_holiday/i18n/pt_BR.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-02 17:30+0000\n"
-"PO-Revision-Date: 2017-01-02 17:30+0000\n"
+"POT-Creation-Date: 2017-02-02 21:44+0000\n"
+"PO-Revision-Date: 2017-02-02 21:44+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -56,10 +56,10 @@ msgid "Alistamento Militar"
 msgstr "Alistamento Militar"
 
 #. module: l10n_br_hr_holiday
-#: code:addons/l10n_br_hr_holiday/models/hr_holidays.py:33
+#: code:addons/l10n_br_hr_holiday/models/hr_holidays.py:49
 #, python-format
 msgid "Atestado Obrigatório!"
-msgstr "Atestado Obrigatório!"
+msgstr "Favor anexar documento comprobatório"
 
 #. module: l10n_br_hr_holiday
 #: model:hr.holidays.status,name:l10n_br_hr_holiday.holiday_status_blood_donation
@@ -109,7 +109,13 @@ msgstr "Disposicao TRE"
 #. module: l10n_br_hr_holiday
 #: model:hr.holidays.status,name:l10n_br_hr_holiday.holiday_status_end_of_year_recess
 msgid "End of year recess"
-msgstr "Recesso de final de ano"
+msgstr "Recesso"
+
+#. module: l10n_br_hr_holiday
+#: selection:hr.holidays,tipo:0
+#: selection:hr.holidays.status,tipo:0
+msgid "Férias"
+msgstr "Férias"
 
 #. module: l10n_br_hr_holiday
 #: field:hr.holidays,attachment_ids:0
@@ -124,7 +130,7 @@ msgstr "Folga"
 #. module: l10n_br_hr_holiday
 #: model:ir.model,name:l10n_br_hr_holiday.model_hr_holidays_status
 msgid "Leave Type"
-msgstr "Tipo de falta"
+msgstr "Tipo de evento"
 
 #. module: l10n_br_hr_holiday
 #: model:hr.holidays.status,name:l10n_br_hr_holiday.holiday_status_Legal_adoption
@@ -144,7 +150,7 @@ msgstr "Limite de Horas"
 #. module: l10n_br_hr_holiday
 #: model:hr.holidays.status,name:l10n_br_hr_holiday.holiday_status_marriage
 msgid "Marriage"
-msgstr "Casamento"
+msgstr "Licença Casamento"
 
 #. module: l10n_br_hr_holiday
 #: model:hr.holidays.status,name:l10n_br_hr_holiday.holiday_status_maternity_leave
@@ -169,23 +175,52 @@ msgid "Need attachment"
 msgstr "Comprovante obrigatório"
 
 #. module: l10n_br_hr_holiday
-#: code:addons/l10n_br_hr_holiday/models/hr_holidays.py:42
-#: code:addons/l10n_br_hr_holiday/models/hr_holidays.py:46
+#: code:addons/l10n_br_hr_holiday/models/hr_holidays.py:58
+#: code:addons/l10n_br_hr_holiday/models/hr_holidays.py:62
 #, python-format
 msgid "Number of days exceeded!"
 msgstr "Quantidade de dias excedido!"
 
 #. module: l10n_br_hr_holiday
-#: code:addons/l10n_br_hr_holiday/models/hr_holidays.py:52
+#: code:addons/l10n_br_hr_holiday/models/hr_holidays.py:68
 #, python-format
 msgid "Number of hours exceeded!"
 msgstr "Quantidade de horas excedidas!"
 
+#. module: l10n_br_hr_holiday
+#: model:ir.ui.menu,name:l10n_br_hr_holiday.menu_ocorrencias
+msgid "Ocorrencias"
+msgstr "Evento"
+
+#. module: l10n_br_hr_holiday
+#: selection:hr.holidays,tipo:0
+#: selection:hr.holidays.status,tipo:0
+#: model:ir.actions.act_window,name:l10n_br_hr_holiday.l10n_br_hr_holiday_action_ocorrencias
+msgid "Ocorrências"
+msgstr "Evento"
+
 #. module: l10n_br_hr_holiday
 #: model:hr.holidays.status,name:l10n_br_hr_holiday.holiday_status_paternity_leave
 msgid "Paternity leave"
 msgstr "Licença paternidade"
 
+#. module: l10n_br_hr_holiday
+#: field:hr.holidays,payroll_discount:0
+#: field:hr.holidays.status,payroll_discount:0
+msgid "Payroll Discount"
+msgstr "Payroll Discount"
+
+#. module: l10n_br_hr_holiday
+#: model:ir.model,name:l10n_br_hr_holiday.model_resource_calendar
+msgid "Resource Calendar"
+msgstr "Calendário de Recursos"
+
+#. module: l10n_br_hr_holiday
+#: field:hr.holidays,tipo:0
+#: field:hr.holidays.status,tipo:0
+msgid "Tipo"
+msgstr "Tipo"
+
 #. module: l10n_br_hr_holiday
 #: field:hr.holidays.status,type_day:0
 msgid "Tipo de Dia"
@@ -194,4 +229,4 @@ msgstr "Tipo de Dia"
 #. module: l10n_br_hr_holiday
 #: model:hr.holidays.status,name:l10n_br_hr_holiday.holiday_status_yearly_leave_days
 msgid "Yearly Leave Days"
-msgstr "Abono Pecuniário"
+msgstr "Abono"
diff --git a/l10n_br_hr_holiday/views/hr_holidays.xml b/l10n_br_hr_holiday/views/hr_holidays.xml
@@ -13,6 +13,9 @@
             <field name="holiday_status_id" position="before">
                 <field name="tipo" invisible="1"/>
             </field>
+            <field name="holiday_type" position="replace">
+                <field name="holiday_type" invisible="1"/>
+            </field>
             <field name="notes" position="before">
                 <field name="payroll_discount"  invisible="1" />
                 <h2><field name="message" readonly="1" /></h2>
@@ -27,7 +30,7 @@
             id="l10n_br_hr_holiday_action_ocorrencias"
             name="Ocorrências"
             res_model="hr.holidays"
-            view_mode="calendar"
+            view_mode="calendar,form"
             context="{'default_tipo':'ocorrencias', 'default_type': 'remove',
                 'search_default_my_leaves':1 }"/>
 
@@ -39,5 +42,9 @@
             groups="base.group_hr_manager"
             sequence="6"/>
 
+    <record id="hr_holidays.view_holiday_new_calendar" model="ir.ui.view">
+        <field name="name">Evento</field>
+    </record>
+
 </data>
 </openerp>
diff --git a/l10n_br_hr_payroll/__openerp__.py b/l10n_br_hr_payroll/__openerp__.py
@@ -16,19 +16,22 @@
         'l10n_br_hr_contract',
         'hr_payroll',
     ],
+    'external_dependencies': {
+        'python': ['pybrasil'],
+    },
     'data': [
         'data/l10n_br_hr_income_tax.xml',
         'data/l10n_br_hr_income_tax_deductable_amount_family.xml',
-        'views/hr_contract.xml',
-        'security/l10n_br_hr_contract.xml',
-        'views/l10n_br_hr_contract/l10n_br_hr_contract.xml',
-        'views/l10n_br_hr_contract/l10n_br_hr_contract_cargo_atividade.xml',
-        'views/l10n_br_hr_contract/l10n_br_hr_contract_filiacao_sindical.xml',
-        'views/l10n_br_hr_contract/l10n_br_hr_contract_jornada.xml',
-        'views/l10n_br_hr_contract/l10n_br_hr_contract_lotacao_local.xml',
-        'views/l10n_br_hr_contract/l10n_br_hr_contract_remuneracao.xml',
         'data/l10n_br_hr_payroll_data_rubricas.xml',
         'data/l10n_br_hr_payroll_data_tabela_INSS.xml',
+        'views/hr_contract.xml',
+        'security/l10n_br_hr_contract.xml',
+        'views/l10n_br_hr_contract.xml',
+        'views/l10n_br_hr_contract_cargo_atividade.xml',
+        'views/l10n_br_hr_contract_filiacao_sindical.xml',
+        'views/l10n_br_hr_contract_jornada.xml',
+        'views/l10n_br_hr_contract_lotacao_local.xml',
+        'views/l10n_br_hr_contract_remuneracao.xml',
         'security/ir.model.access.csv',
         'views/l10n_br_hr_child_benefit_view.xml',
         'views/l10n_br_hr_income_tax_view.xml',
@@ -38,6 +41,11 @@
         'views/l10n_br_hr_social_security_tax_view.xml',
         'views/hr_payslip.xml',
         'views/hr_salary_rule.xml',
+        'views/hr_payroll_structure.xml',
+        'views/hr_payslip_run.xml',
+    ],
+    'demo': [
+        'demo/hr_contract.xml',
     ],
     'installable': True,
     'auto_install': False,

diff --git a/l10n_br_hr_payroll/data/l10n_br_hr_income_tax.xml b/l10n_br_hr_payroll/data/l10n_br_hr_income_tax.xml
@@ -5,6 +5,40 @@
 
 <openerp>
     <data>
+        <record id="l10n_br_hr_income_tax_2016_rate_1" model="l10n_br.hr.income.tax">
+            <field name="year">2016</field>
+            <field name="max_wage">0</field>
+            <field name="rate">0</field>
+            <field name="deductable">0</field>
+        </record>
+
+        <record id="l10n_br_hr_income_tax_2016_rate_2" model="l10n_br.hr.income.tax">
+            <field name="year">2016</field>
+            <field name="max_wage">1903.99</field>
+            <field name="rate">7.5</field>
+            <field name="deductable">142.80</field>
+        </record>
+
+        <record id="l10n_br_hr_income_tax_2016_rate_3" model="l10n_br.hr.income.tax">
+            <field name="year">2016</field>
+            <field name="max_wage">2826.66</field>
+            <field name="rate">15.00</field>
+            <field name="deductable">354.80</field>
+        </record>
+
+        <record id="l10n_br_hr_income_tax_2016_rate_4" model="l10n_br.hr.income.tax">
+            <field name="year">2016</field>
+            <field name="max_wage">3751.06</field>
+            <field name="rate">22.50</field>
+            <field name="deductable">636.13</field>
+        </record>
+
+        <record id="l10n_br_hr_income_tax_2016_rate_5" model="l10n_br.hr.income.tax">
+            <field name="year">2016</field>
+            <field name="max_wage">4664.68</field>
+            <field name="rate">27.5</field>
+            <field name="deductable">869.36</field>
+        </record>
 
         <record id="l10n_br_hr_income_tax_2017_rate_1" model="l10n_br.hr.income.tax">
             <field name="year">2017</field>