diff --git a/l10n_pe_hr_payroll/__manifest__.py b/l10n_pe_hr_payroll/__manifest__.py index 6530714a..3c5d4cd3 100644 --- a/l10n_pe_hr_payroll/__manifest__.py +++ b/l10n_pe_hr_payroll/__manifest__.py @@ -3,7 +3,7 @@ { 'name': 'Peru - Payroll', 'author': 'Hibou Corp. ', - 'version': '15.0.2022.0.0', + 'version': '15.0.2022.1.0', 'category': 'Payroll Localization', 'depends': [ 'hr_payroll_hibou', diff --git a/l10n_pe_hr_payroll/data/base.xml b/l10n_pe_hr_payroll/data/base.xml index a33cb6c8..cdea1281 100644 --- a/l10n_pe_hr_payroll/data/base.xml +++ b/l10n_pe_hr_payroll/data/base.xml @@ -99,6 +99,28 @@ + + + Extraordinary Wage + EXTRA + + + + + + python + result = inputs.EXTRA.amount > 0.0 if inputs.EXTRA else False + code + result = inputs.EXTRA.amount if inputs.EXTRA else 0 + ALW_EXTRA + + Extraordinary Wage + + + + Bonus @@ -114,8 +136,8 @@ result = inputs.BONO.amount > 0.0 if inputs.BONO else False code result = inputs.BONO.amount if inputs.BONO else 0 - BASIC_BONO - + ALW_BONO + Bonus diff --git a/l10n_pe_hr_payroll/data/er_rules.xml b/l10n_pe_hr_payroll/data/er_rules.xml index 87bc9cc5..5c4fdc5b 100644 --- a/l10n_pe_hr_payroll/data/er_rules.xml +++ b/l10n_pe_hr_payroll/data/er_rules.xml @@ -21,9 +21,9 @@ ER: PE Essalud ER_PE_ESSALUD python - result = categories.BASIC + result = categories.GROSS code - result, result_rate = categories.BASIC, -payslip.rule_parameter('er_essalud') + result, result_rate = categories.GROSS, -payslip.rule_parameter('er_essalud') diff --git a/l10n_pe_hr_payroll/data/integration_rules.xml b/l10n_pe_hr_payroll/data/integration_rules.xml index af2684ed..57274a74 100644 --- a/l10n_pe_hr_payroll/data/integration_rules.xml +++ b/l10n_pe_hr_payroll/data/integration_rules.xml @@ -6,7 +6,7 @@ result = inputs.COMMISSION.amount > 0.0 if inputs.COMMISSION else False code result = inputs.COMMISSION.amount if inputs.COMMISSION else 0 - BASIC_COM + ALW_COM Commissions @@ -19,7 +19,7 @@ result = inputs.BADGES.amount > 0.0 if inputs.BADGES else False code result = inputs.BADGES.amount if inputs.BADGES else 0 - BASIC_BADGES + ALW_BADGES Badges diff --git a/l10n_pe_hr_payroll/data/ir_5ta_cat_rules.xml b/l10n_pe_hr_payroll/data/ir_5ta_cat_rules.xml index c1ac88cb..5341acc7 100644 --- a/l10n_pe_hr_payroll/data/ir_5ta_cat_rules.xml +++ b/l10n_pe_hr_payroll/data/ir_5ta_cat_rules.xml @@ -51,9 +51,9 @@ EE: PE IR 5th Cat. EE_PE_IR_5TA_CAT python - result, _ = ir_5ta_cat(payslip, categories, worked_days, inputs, BASIC) + result, _ = ir_5ta_cat(payslip, categories, worked_days, inputs) code - result, result_rate = ir_5ta_cat(payslip, categories, worked_days, inputs, BASIC) + result, result_rate = ir_5ta_cat(payslip, categories, worked_days, inputs) diff --git a/l10n_pe_hr_payroll/models/rules/ir_5ta_cat.py b/l10n_pe_hr_payroll/models/rules/ir_5ta_cat.py index f137c0b5..ffac865c 100644 --- a/l10n_pe_hr_payroll/models/rules/ir_5ta_cat.py +++ b/l10n_pe_hr_payroll/models/rules/ir_5ta_cat.py @@ -2,7 +2,8 @@ from datetime import date -def ir_5ta_cat(payslip, categories, worked_days, inputs, basic_wage): +def ir_5ta_cat(payslip, categories, worked_days, inputs): + basic_wage = categories.BASIC if payslip.dict.contract_id.pe_payroll_config_value('ee_5ta_cat_exempt'): return 0.0, 0.0 diff --git a/l10n_pe_hr_payroll_account/__manifest__.py b/l10n_pe_hr_payroll_account/__manifest__.py index cd5bab95..249482cd 100644 --- a/l10n_pe_hr_payroll_account/__manifest__.py +++ b/l10n_pe_hr_payroll_account/__manifest__.py @@ -3,7 +3,7 @@ { 'name': 'Peru - Payroll with Accounting', 'author': 'Hibou Corp. ', - 'version': '15.0.2022.0.0', + 'version': '15.0.2022.1.0', 'category': 'Human Resources', 'depends': [ 'l10n_pe_hr_payroll', diff --git a/l10n_pe_hr_payroll_account/models/account_chart_template.py b/l10n_pe_hr_payroll_account/models/account_chart_template.py index a572a058..e2b58539 100644 --- a/l10n_pe_hr_payroll_account/models/account_chart_template.py +++ b/l10n_pe_hr_payroll_account/models/account_chart_template.py @@ -3,6 +3,7 @@ from odoo import models EXP_SALARY = '6211000' +EXP_EXTRA = '621100' EXP_COM = '6212000' EXP_BONO = '6213000' EXP_ESSALUD = '6271000' @@ -34,6 +35,7 @@ class AccountChartTemplate(models.Model): pay_ir_5ta_cat=PAY_IR_5TA_CAT, pay_essalud=PAY_ESSALUD, exp_salary=EXP_SALARY, + exp_extra=EXP_EXTRA, exp_com=EXP_COM, exp_bono=EXP_BONO, exp_essalud=EXP_ESSALUD, @@ -46,6 +48,7 @@ class AccountChartTemplate(models.Model): pay_ir_5ta_cat, pay_essalud, exp_salary, + exp_extra, exp_com, exp_bono, exp_essalud, @@ -122,11 +125,12 @@ class AccountChartTemplate(models.Model): # BASIC* -> SALARY_EXPENSE debit account set_rule_accounts('BASIC%', accounts[exp_salary], accounts['none']) - set_rule_accounts('BASIC_COM%', accounts[exp_com], accounts['none']) - set_rule_accounts('BASIC_BONO%', accounts[exp_bono], accounts['none']) - set_rule_accounts('BASIC_BADGES%', accounts[exp_bono], accounts['none']) + set_rule_accounts('BASIC_EXTRA%', accounts[exp_extra], accounts['none']) # ALW* -> SALARY_EXPENSE debit account set_rule_accounts('ALW%', accounts[exp_salary], accounts['none']) + set_rule_accounts('ALW_COM%', accounts[exp_com], accounts['none']) + set_rule_accounts('ALW_BONO%', accounts[exp_bono], accounts['none']) + set_rule_accounts('ALW_BADGES%', accounts[exp_bono], accounts['none']) # EE_* -> AP debit set_rule_accounts('EE_%', accounts[pay_ee], accounts['none']) # initialize set_rule_accounts('EE_PE_AFP%', accounts[pay_afp], accounts['none'])