audrius/suite
1
0
Fork 1
mirror of https://gitlab.com/hibou-io/hibou-odoo/suite.git synced 2025-01-20 12:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '15.0' into 15.0-test

Browse Source
This commit is contained in:
Jared Kipe
2022-07-01 01:36:03 +00:00
parent cd187c778c f96063180b
commit fb7c40c3ba
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
l10n_pe_hr_payroll/data/base.xml
View File

@@ -114,8 +114,8 @@
<field name="condition_python">result = inputs.EXTRA.amount > 0.0 if inputs.EXTRA else False</field> <field name="condition_python">result = inputs.EXTRA.amount > 0.0 if inputs.EXTRA else False</field>
<field name="amount_select">code</field> <field name="amount_select">code</field>
<field name="amount_python_compute">result = inputs.EXTRA.amount if inputs.EXTRA else 0</field> <field name="amount_python_compute">result = inputs.EXTRA.amount if inputs.EXTRA else 0</field>
<field name="code">BASIC_EXTRA</field> <field name="code">ALW_EXTRA</field>
<field name="category_id" ref="hr_payroll.BASIC"/> <field name="category_id" ref="hr_payroll.ALW"/>
<field name="name">Extraordinary Wage</field> <field name="name">Extraordinary Wage</field>
<field name="sequence" eval="24"/> <field name="sequence" eval="24"/>
<field name="struct_id" ref="l10n_pe_hr_payroll.hr_payroll_structure"/> <field name="struct_id" ref="l10n_pe_hr_payroll.hr_payroll_structure"/>

4
l10n_pe_hr_payroll_account/models/account_chart_template.py
View File

@@ -125,12 +125,12 @@ class AccountChartTemplate(models.Model):
# BASIC* -> SALARY_EXPENSE debit account # BASIC* -> SALARY_EXPENSE debit account
set_rule_accounts('BASIC%', accounts[exp_salary], accounts['none']) set_rule_accounts('BASIC%', accounts[exp_salary], accounts['none'])
set_rule_accounts('BASIC_EXTRA%', accounts[exp_extra], accounts['none'])
# ALW* -> SALARY_EXPENSE debit account # ALW* -> SALARY_EXPENSE debit account
set_rule_accounts('ALW%', accounts[exp_salary], accounts['none']) 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_BONO%', accounts[exp_bono], accounts['none'])
set_rule_accounts('ALW_BADGES%', accounts[exp_bono], accounts['none']) set_rule_accounts('ALW_BADGES%', accounts[exp_bono], accounts['none'])
set_rule_accounts('ALW_COM%', accounts[exp_com], accounts['none'])
set_rule_accounts('ALW_EXTRA%', accounts[exp_extra], accounts['none'])
# EE_* -> AP debit # EE_* -> AP debit
set_rule_accounts('EE_%', accounts[pay_ee], accounts['none']) # initialize set_rule_accounts('EE_%', accounts[pay_ee], accounts['none']) # initialize
set_rule_accounts('EE_PE_AFP%', accounts[pay_afp], accounts['none']) set_rule_accounts('EE_PE_AFP%', accounts[pay_afp], accounts['none'])