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 'fix/15.0/l10n_us_hr_payroll_401k__only_fit_exempt' into '15.0'

Browse Source 
fix/15.0/l10n_us_hr_payroll_401k__only_fit_exempt into 15.0

See merge request hibou-io/hibou-odoo/suite!1214
This commit is contained in:
Jared Kipe
2021-12-07 23:04:09 +00:00
parent 0d648cd87d 9d7cea3c13
commit 0b3fa09fb6
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
l10n_us_hr_payroll_401k/data/payroll.xml
View File

@@ -57,7 +57,7 @@
<record id="category_ee_401k_traditional" model="hr.salary.rule.category">
<field name="name">EE: 401K Traditional</field>
<field name="code">EE_IRA</field>
<field name="parent_id" ref="l10n_us_hr_payroll.hr_payroll_category_ded_fit_fica_futa_exempt"/>
<field name="parent_id" ref="l10n_us_hr_payroll.hr_payroll_category_ded_fit_exempt"/>
</record>
<record id="category_ee_401k_roth" model="hr.salary.rule.category">
<field name="name">EE: 401K Roth</field>

2
l10n_us_hr_payroll_401k/models/payslip.py
View File

@@ -48,7 +48,7 @@ def er_401k_match(wages, payslip, categories, worked_days, inputs):
else:
if remaining - result < 0.0:
result = remaining
return result
return -result
class HRPayslip(models.Model):

14
l10n_us_hr_payroll_401k/tests/test_payroll.py
View File

@@ -33,7 +33,7 @@ class TestUsPayslip(common.TestUsPayslip):
er_ira_line = payslip.line_ids.filtered(lambda l: l.code == 'ER_IRA_MATCH')
self.assertTrue(er_ira_line)
self.assertPayrollEqual(er_ira_line.amount, 80.0) # 4% of wage up to their contribution
self.assertPayrollEqual(er_ira_line.amount, -80.0) # 4% of wage up to their contribution
contract.ira_rate = 0.0
contract.ira_amount = 25.0
@@ -44,7 +44,7 @@ class TestUsPayslip(common.TestUsPayslip):
er_ira_line = payslip.line_ids.filtered(lambda l: l.code == 'ER_IRA_MATCH')
self.assertTrue(er_ira_line)
self.assertPayrollEqual(er_ira_line.amount, 25.0) # 4% of wage up to their contribution
self.assertPayrollEqual(er_ira_line.amount, -25.0) # 4% of wage up to their contribution
def test_02_payslip_roth(self):
wage = 2000.0
@@ -61,7 +61,7 @@ class TestUsPayslip(common.TestUsPayslip):
er_ira_line = payslip.line_ids.filtered(lambda l: l.code == 'ER_IRA_MATCH')
self.assertTrue(er_ira_line)
self.assertPayrollEqual(er_ira_line.amount, 80.0) # 4% of wage up to their contribution
self.assertPayrollEqual(er_ira_line.amount, -80.0) # 4% of wage up to their contribution
contract.ira_roth_rate = 0.0
contract.ira_roth_amount = 25.0
@@ -72,7 +72,7 @@ class TestUsPayslip(common.TestUsPayslip):
er_ira_line = payslip.line_ids.filtered(lambda l: l.code == 'ER_IRA_MATCH')
self.assertTrue(er_ira_line)
self.assertPayrollEqual(er_ira_line.amount, 25.0) # 4% of wage up to their contribution
self.assertPayrollEqual(er_ira_line.amount, -25.0) # 4% of wage up to their contribution
def test_10_payslip_limits(self):
self.er_match_parameter.parameter_value = '20.0' # 20% match up to salary
@@ -92,7 +92,7 @@ class TestUsPayslip(common.TestUsPayslip):
self.assertPayrollEqual(ira_line.amount, -(wage * rate / 100.0))
er_ira_line = payslip.line_ids.filtered(lambda l: l.code == 'ER_IRA_MATCH')
self.assertTrue(er_ira_line)
self.assertPayrollEqual(er_ira_line.amount, -ira_line.amount)
self.assertPayrollEqual(er_ira_line.amount, ira_line.amount)
common.process_payslip(payslip)
# Payslip 2 - 3.5k
@@ -104,7 +104,7 @@ class TestUsPayslip(common.TestUsPayslip):
self.assertPayrollEqual(ira_line.amount, -(self.EE_LIMIT-(wage * rate / 100.0)))
er_ira_line = payslip.line_ids.filtered(lambda l: l.code == 'ER_IRA_MATCH')
self.assertTrue(er_ira_line)
self.assertPayrollEqual(er_ira_line.amount, -ira_line.amount)
self.assertPayrollEqual(er_ira_line.amount, ira_line.amount)
common.process_payslip(payslip)
# Payslip 3 - 0 (over limit)
@@ -124,7 +124,7 @@ class TestUsPayslip(common.TestUsPayslip):
self.assertPayrollEqual(ira_line.amount, -self.EE_LIMIT_CATCHUP)
er_ira_line = payslip.line_ids.filtered(lambda l: l.code == 'ER_IRA_MATCH')
self.assertTrue(er_ira_line)
self.assertPayrollEqual(er_ira_line.amount, -ira_line.amount)
self.assertPayrollEqual(er_ira_line.amount, ira_line.amount)
common.process_payslip(payslip)
# Note that the company limit is higher than what is possible by 'match'