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 'mig/12.0/l10n_us_hr_payroll__2020' into '12.0'

Browse Source 
mig/12.0/l10n_us_hr_payroll__2020 into 12.0

See merge request hibou-io/hibou-odoo/suite!248
This commit is contained in:
Jared Kipe
2020-01-10 17:30:48 +00:00
parent 7d9b31a7e7 22f95b4cc2
commit f0a54281b5
3 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
l10n_us_hr_payroll/data/state/wa_washington.xml
View File

@@ -169,20 +169,9 @@
<field name="name">ER: US WA Washington State LNI</field>
<field name="code">ER_US_WA_LNI</field>
<field name="condition_select">python</field>
<field name="condition_python">result = is_us_state(payslip, 'WA') and payslip.contract_id.us_payroll_config_value('workers_comp_er_code') and worked_days.WORK100 and worked_days.WORK100.number_of_hours and payslip.dict.rule_parameter(payslip.contract_id.us_payroll_config_value('workers_comp_er_code'))</field>
<field name="condition_python">result = is_us_state(payslip, 'WA') and payslip.dict.contract_id.us_payroll_config_value('workers_comp_ee_code') and worked_days.WORK100 and worked_days.WORK100.number_of_hours and payslip.dict.rule_parameter(payslip.dict.contract_id.us_payroll_config_value('workers_comp_er_code'))</field>
<field name="amount_select">code</field>
<field name="amount_python_compute">
hours = worked_days.WORK100.number_of_hours
rate = payslip.dict.rule_parameter(payslip.contract_id.us_payroll_config_value('workers_comp_er_code'))
try:
# Redo employee withholding calculation
ee_withholding = worked_days.WORK100.number_of_hours * -payslip.dict.rule_parameter(payslip.contract_id.us_payroll_config_value('workers_comp_ee_code')) / 100.0
except:
ee_withholding = 0.0
er_withholding = -(hours * (rate / 100.0)) - ee_withholding
result = hours
result_rate = (er_withholding / hours) * 100.0
</field>
<field name="amount_python_compute">result, result_rate = worked_days.WORK100.number_of_hours, -payslip.dict.rule_parameter(payslip.dict.contract_id.us_payroll_config_value('workers_comp_er_code'))</field>
<field name="register_id" ref="contrib_register_us_wa_dor_lni"/>
<field name="appears_on_payslip" eval="False"/>
</record>

2
l10n_us_hr_payroll/tests/test_us_wa_washington_payslip_2019.py
View File

@@ -65,7 +65,7 @@ class TestUsWAPayslip(TestUsPayslip):
self.assertPayrollEqual(cats['ER_US_SUTA'], salary * wa_unemp)
self.assertPayrollEqual(rules['EE_US_WA_LNI'], -(self.test_ee_lni * hours_in_period))
self.assertPayrollEqual(rules['ER_US_WA_LNI'], -(self.test_er_lni * hours_in_period) - rules['EE_US_WA_LNI'])
self.assertPayrollEqual(rules['ER_US_WA_LNI'], -(self.test_er_lni * hours_in_period))
# Both of these are known to be within 1 penny
self.assertPayrollAlmostEqual(rules['EE_US_WA_FML'], -(salary * (self.WA_FML_RATE / 100.0) * (self.WA_FML_RATE_EE / 100.0)))
self.assertPayrollAlmostEqual(rules['ER_US_WA_FML'], -(salary * (self.WA_FML_RATE / 100.0) * (self.WA_FML_RATE_ER / 100.0)))

2
l10n_us_hr_payroll/tests/test_us_wa_washington_payslip_2020.py
View File

@@ -63,7 +63,7 @@ class TestUsWAPayslip(TestUsPayslip):
rules = self._getRules(payslip)
self.assertPayrollEqual(rules['EE_US_WA_LNI'], -(self.test_ee_lni * hours_in_period))
self.assertPayrollEqual(rules['ER_US_WA_LNI'], -(self.test_er_lni * hours_in_period) - rules['EE_US_WA_LNI'])
self.assertPayrollEqual(rules['ER_US_WA_LNI'], -(self.test_er_lni * hours_in_period))
# Both of these are known to be within 1 penny
self.assertPayrollAlmostEqual(rules['EE_US_WA_FML'], -(salary * (self.WA_FML_RATE / 100.0) * (self.WA_FML_RATE_EE / 100.0)))
self.assertPayrollAlmostEqual(rules['ER_US_WA_FML'], -(salary * (self.WA_FML_RATE / 100.0) * (self.WA_FML_RATE_ER / 100.0)))