diff --git a/l10n_us_hr_payroll/data/state/wa_washington.xml b/l10n_us_hr_payroll/data/state/wa_washington.xml index 52e0b736..91100d4e 100644 --- a/l10n_us_hr_payroll/data/state/wa_washington.xml +++ b/l10n_us_hr_payroll/data/state/wa_washington.xml @@ -169,20 +169,9 @@ ER: US WA Washington State LNI ER_US_WA_LNI 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')) + 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')) code - -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 - + 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')) diff --git a/l10n_us_hr_payroll/tests/test_us_wa_washington_payslip_2019.py b/l10n_us_hr_payroll/tests/test_us_wa_washington_payslip_2019.py index 11cf6138..88486960 100755 --- a/l10n_us_hr_payroll/tests/test_us_wa_washington_payslip_2019.py +++ b/l10n_us_hr_payroll/tests/test_us_wa_washington_payslip_2019.py @@ -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))) diff --git a/l10n_us_hr_payroll/tests/test_us_wa_washington_payslip_2020.py b/l10n_us_hr_payroll/tests/test_us_wa_washington_payslip_2020.py index 9272eba0..65eca5d0 100755 --- a/l10n_us_hr_payroll/tests/test_us_wa_washington_payslip_2020.py +++ b/l10n_us_hr_payroll/tests/test_us_wa_washington_payslip_2020.py @@ -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)))