From edd3bbf19247e958e2bffa7c0563e95cca9fa217 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Tue, 8 Jan 2019 11:49:20 -0800 Subject: [PATCH] Backport PA Payroll to 10.0 WIP --- l10n_us_pa_hr_payroll/__init__.py | 1 + l10n_us_pa_hr_payroll/__manifest__.py | 29 +++++ l10n_us_pa_hr_payroll/data/base.xml | 66 +++++++++++ l10n_us_pa_hr_payroll/data/final.xml | 21 ++++ l10n_us_pa_hr_payroll/data/rates.xml | 24 ++++ l10n_us_pa_hr_payroll/data/rules.xml | 107 ++++++++++++++++++ l10n_us_pa_hr_payroll/models/__init__.py | 1 + l10n_us_pa_hr_payroll/models/hr_payroll.py | 7 ++ l10n_us_pa_hr_payroll/tests/__init__.py | 2 + .../tests/test_us_pa_payslip_2018.py | 23 ++-- .../tests/test_us_pa_payslip_2019.py | 33 ++++++ .../views/hr_payroll_views.xml | 20 ++++ 12 files changed, 318 insertions(+), 16 deletions(-) create mode 100644 l10n_us_pa_hr_payroll/__init__.py create mode 100755 l10n_us_pa_hr_payroll/__manifest__.py create mode 100755 l10n_us_pa_hr_payroll/data/base.xml create mode 100755 l10n_us_pa_hr_payroll/data/final.xml create mode 100644 l10n_us_pa_hr_payroll/data/rates.xml create mode 100755 l10n_us_pa_hr_payroll/data/rules.xml create mode 100644 l10n_us_pa_hr_payroll/models/__init__.py create mode 100755 l10n_us_pa_hr_payroll/models/hr_payroll.py create mode 100755 l10n_us_pa_hr_payroll/tests/__init__.py create mode 100755 l10n_us_pa_hr_payroll/tests/test_us_pa_payslip_2019.py create mode 100755 l10n_us_pa_hr_payroll/views/hr_payroll_views.xml diff --git a/l10n_us_pa_hr_payroll/__init__.py b/l10n_us_pa_hr_payroll/__init__.py new file mode 100644 index 00000000..0650744f --- /dev/null +++ b/l10n_us_pa_hr_payroll/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/l10n_us_pa_hr_payroll/__manifest__.py b/l10n_us_pa_hr_payroll/__manifest__.py new file mode 100755 index 00000000..28207c9c --- /dev/null +++ b/l10n_us_pa_hr_payroll/__manifest__.py @@ -0,0 +1,29 @@ +{ + 'name': 'USA - Pennsylvania - Payroll', + 'author': 'Hibou Corp. ', + 'license': 'AGPL-3', + 'category': 'Localization', + 'depends': ['l10n_us_hr_payroll'], + 'version': '11.0.2019.0.0', + 'description': """ +USA::Pennsylvania Payroll Rules. +================================ + +* Partner for Pennsylvania Department of Revenue +* Contribution register for Pennsylvania Department of Revenue - Unemployment Insurance +* Contribution register Pennsylvania Department of Revenue - State Income Tax +* Contract level Pennsylvania Unemployment Rate +* Company level Pennsylvania Unemployement Rate + """, + + 'auto_install': False, + 'website': 'https://hibou.io/', + 'data': [ + 'views/hr_payroll_views.xml', + 'data/base.xml', + 'data/rates.xml', + 'data/rules.xml', + 'data/final.xml', + ], + 'installable': True +} diff --git a/l10n_us_pa_hr_payroll/data/base.xml b/l10n_us_pa_hr_payroll/data/base.xml new file mode 100755 index 00000000..9dcc5893 --- /dev/null +++ b/l10n_us_pa_hr_payroll/data/base.xml @@ -0,0 +1,66 @@ + + + + + + Pennsylvania Department of Revenue - Unemployment Tax(Employee) + 1 + + + + + Pennsylvania Department of Revenue - Unemployment Tax(Employer) + 1 + + + + + Pennsylvania Department of Revenue - Income Tax + 1 + + + + + Pennsylvania Unemployment(Employee) + Pennsylvania Department of Revenue - Unemployment(Employee) + + + + + Pennsylvania Unemployment(Employer) + Pennsylvania Department of Revenue - Unemployment(Employee) + + + + + Pennsylvania Income Tax Withholding + Pennsylvania Department of Revenue - Income Tax + + + + + + + Wage: ER: US-PA Pennsylvania Unemployment + WAGE_ER_US_PA_UNEMP + + + + EE: US-PA Unemployment + EE_US_PA_UNEMP + + + + + ER: US-PA Unemployment + ER_US_PA_UNEMP + + + + + EE: US-PA Income Withholding + EE_US_PA_INC_WITHHOLD + + + + diff --git a/l10n_us_pa_hr_payroll/data/final.xml b/l10n_us_pa_hr_payroll/data/final.xml new file mode 100755 index 00000000..7f23e539 --- /dev/null +++ b/l10n_us_pa_hr_payroll/data/final.xml @@ -0,0 +1,21 @@ + + + + + + + US_PA_EMP + USA Pennsylvania Employee + + + + + + + diff --git a/l10n_us_pa_hr_payroll/data/rates.xml b/l10n_us_pa_hr_payroll/data/rates.xml new file mode 100644 index 00000000..9143d25b --- /dev/null +++ b/l10n_us_pa_hr_payroll/data/rates.xml @@ -0,0 +1,24 @@ + + + + + US Pennsylvania Unemployment (Company) + ER_US_PA_UNEMP + 3.6890 + 2018-01-01 + + + + UUS Pennsylvania Unemployment (Employee) + EE_US_PA_UNEMP + 0.06 + 2018-01-01 + + + US Pennsylvania Income Tax Rate (default) + US_PA_INC_WITHHOLD + 3.07 + 2018-01-01 + + + \ No newline at end of file diff --git a/l10n_us_pa_hr_payroll/data/rules.xml b/l10n_us_pa_hr_payroll/data/rules.xml new file mode 100755 index 00000000..8ea08781 --- /dev/null +++ b/l10n_us_pa_hr_payroll/data/rules.xml @@ -0,0 +1,107 @@ + + + + + + + + + Wage: ER: US-PA Unemployment + WAGE_ER_US_PA_UNEMP + python + result = (contract.futa_type != contract.FUTA_TYPE_BASIC) + code + +### +year = int(payslip.dict.date_from[:4]) +rate = payslip.dict.get_rate('ER_US_PA_UNEMP') +ytd = payslip.sum('WAGE_ER_US_PA_UNEMP', str(year) + '-01-01', str(year+1) + '-01-01') +ytd += contract.external_wages +remaining = rate.wage_limit_year - ytd +if remaining <= 0.0: + result = 0 +elif remaining < categories.BASIC: + result = remaining +else: + result = categories.BASIC + + + + + + + EE: US-PA Unemployment + EE_US_PA_UNEMP + python + result = (contract.futa_type != contract.FUTA_TYPE_BASIC) + code + +rate = payslip.dict.get_rate('EE_US_PA_UNEMP') +result_rate = -rate.rate +result = categories.BASIC + +# result_rate of 0 implies 100% due to bug +if result_rate == 0.0: + result = 0.0 + + + + + + + + ER: US-PA Unemployment + ER_US_PA_UNEMP + python + result = (contract.futa_type != contract.FUTA_TYPE_BASIC) + code + +rate = payslip.dict.get_rate('ER_US_PA_UNEMP') +result_rate = -rate.rate +result = categories.WAGE_ER_US_PA_UNEMP + +# result_rate of 0 implies 100% due to bug +if result_rate == 0.0: + result = 0.0 + + + + + + + + + EE: US-PA Income Withholding + EE_US_PA_INC_WITHHOLD + python + result = True + code + +rate = payslip.dict.get_rate('US_PA_INC_WITHHOLD') +wages = categories.GROSS +result_rate = -rate.rate +result = wages + +# result_rate of 0 implies 100% due to bug +if result_rate == 0.0: + result = 0.0 + + + + + + + + EE: US-PA Income Withholding Additional + EE_US_PA_INC_WITHHOLD_ADD + python + result = (contract.pa_additional_withholding) + code + +result = -contract.pa_additional_withholding + + + + + + diff --git a/l10n_us_pa_hr_payroll/models/__init__.py b/l10n_us_pa_hr_payroll/models/__init__.py new file mode 100644 index 00000000..e99aa24a --- /dev/null +++ b/l10n_us_pa_hr_payroll/models/__init__.py @@ -0,0 +1 @@ +from . import hr_payroll diff --git a/l10n_us_pa_hr_payroll/models/hr_payroll.py b/l10n_us_pa_hr_payroll/models/hr_payroll.py new file mode 100755 index 00000000..a2c36df1 --- /dev/null +++ b/l10n_us_pa_hr_payroll/models/hr_payroll.py @@ -0,0 +1,7 @@ +from odoo import models, fields, api + + +class USPAHrContract(models.Model): + _inherit = 'hr.contract' + + pa_additional_withholding = fields.Float(string="Additional Withholding") diff --git a/l10n_us_pa_hr_payroll/tests/__init__.py b/l10n_us_pa_hr_payroll/tests/__init__.py new file mode 100755 index 00000000..6bf37afe --- /dev/null +++ b/l10n_us_pa_hr_payroll/tests/__init__.py @@ -0,0 +1,2 @@ +from . import test_us_pa_payslip_2018 +from . import test_us_pa_payslip_2019 diff --git a/l10n_us_pa_hr_payroll/tests/test_us_pa_payslip_2018.py b/l10n_us_pa_hr_payroll/tests/test_us_pa_payslip_2018.py index f6717bfe..a3ade9bd 100755 --- a/l10n_us_pa_hr_payroll/tests/test_us_pa_payslip_2018.py +++ b/l10n_us_pa_hr_payroll/tests/test_us_pa_payslip_2018.py @@ -1,5 +1,4 @@ from odoo.addons.l10n_us_hr_payroll.tests.test_us_payslip import TestUsPayslip, process_payslip -from odoo.addons.l10n_us_hr_payroll.models.l10n_us_hr_payroll import USHrContract class TestUsPAPayslip(TestUsPayslip): @@ -7,24 +6,17 @@ class TestUsPAPayslip(TestUsPayslip): # Taxes and Rates ### PA_UNEMP_MAX_WAGE = 10000.0 + ER_PA_UNEMP = -3.6890 / 100.0 + EE_PA_UNEMP = -0.06 / 100.0 + PA_INC_WITHHOLD = 3.07 def test_2018_taxes(self): - self.debug = True salary = 4166.67 wh = -127.92 employee = self._createEmployee() - employee.company_id.pa_unemp_employee_rate_2018 = 0.06 - employee.company_id.pa_unemp_company_rate_2018 = 3.6785 - employee.company_id.pa_withhold_rate_2018 = 3.07 - contract = self._createContract(employee, salary, struct_id=self.ref('l10n_us_pa_hr_payroll.hr_payroll_salary_structure_us_pa_employee')) - # tax rates - pa_unemp_employee = contract.pa_unemp_employee_rate(2018) / -100.0 - pa_unemp_company = contract.pa_unemp_company_rate(2018) / -100.0 - - self._log('2018 Pennsylvania tax first payslip:') payslip = self._createPayslip(employee, '2018-01-01', '2018-01-31') payslip.onchange_contract() @@ -32,8 +24,7 @@ class TestUsPAPayslip(TestUsPayslip): cats = self._getCategories(payslip) - self.assertPayrollEqual(cats['PA_UNEMP_WAGES'], salary) - self.assertPayrollEqual(cats['PA_UNEMP_EMPLOYEE'], cats['PA_UNEMP_WAGES'] * pa_unemp_employee) - self.assertPayrollEqual(cats['PA_UNEMP_COMPANY'], cats['PA_UNEMP_WAGES'] * pa_unemp_company) - self.assertPayrollEqual(cats['PA_WITHHOLD'], wh) - + self.assertPayrollEqual(cats['WAGE_ER_US_PA_UNEMP'], salary) + self.assertPayrollEqual(cats['EE_US_PA_UNEMP'], cats['BASIC'] * self.EE_PA_UNEMP) + self.assertPayrollEqual(cats['ER_US_PA_UNEMP'], cats['WAGE_ER_US_PA_UNEMP'] * self.ER_PA_UNEMP) + self.assertPayrollEqual(cats['EE_US_PA_INC_WITHHOLD'], wh) diff --git a/l10n_us_pa_hr_payroll/tests/test_us_pa_payslip_2019.py b/l10n_us_pa_hr_payroll/tests/test_us_pa_payslip_2019.py new file mode 100755 index 00000000..df13a93e --- /dev/null +++ b/l10n_us_pa_hr_payroll/tests/test_us_pa_payslip_2019.py @@ -0,0 +1,33 @@ +from odoo.addons.l10n_us_hr_payroll.tests.test_us_payslip import TestUsPayslip, process_payslip + + +class TestUsPAPayslip(TestUsPayslip): + ### + # Taxes and Rates + ### + PA_UNEMP_MAX_WAGE = 10000.0 + ER_PA_UNEMP = -3.6890 / 100.0 + EE_PA_UNEMP = -0.06 / 100.0 + PA_INC_WITHHOLD = 3.07 + + def test_2019_taxes(self): + salary = 4166.67 + additional_withhold = 5.0 + wh = -127.92 - additional_withhold + + + employee = self._createEmployee() + contract = self._createContract(employee, salary, struct_id=self.ref('l10n_us_pa_hr_payroll.hr_payroll_salary_structure_us_pa_employee')) + contract.pa_additional_withholding = additional_withhold + + self._log('2019 Pennsylvania tax first payslip:') + payslip = self._createPayslip(employee, '2019-01-01', '2019-01-31') + payslip.onchange_contract() + payslip.compute_sheet() + + cats = self._getCategories(payslip) + + self.assertPayrollEqual(cats['WAGE_ER_US_PA_UNEMP'], salary) + self.assertPayrollEqual(cats['EE_US_PA_UNEMP'], cats['BASIC'] * self.EE_PA_UNEMP) + self.assertPayrollEqual(cats['ER_US_PA_UNEMP'], cats['WAGE_ER_US_PA_UNEMP'] * self.ER_PA_UNEMP) + self.assertPayrollEqual(cats['EE_US_PA_INC_WITHHOLD'], wh) diff --git a/l10n_us_pa_hr_payroll/views/hr_payroll_views.xml b/l10n_us_pa_hr_payroll/views/hr_payroll_views.xml new file mode 100755 index 00000000..08b44a88 --- /dev/null +++ b/l10n_us_pa_hr_payroll/views/hr_payroll_views.xml @@ -0,0 +1,20 @@ + + + + + hr.contract.form.inherit + hr.contract + 148 + + + + + + + + + + + + +