From 28414dc5bcd2b4c7de207d434f056f98a103ee1e Mon Sep 17 00:00:00 2001 From: Kristen Marie Kulha Date: Fri, 25 May 2018 17:01:59 -0700 Subject: [PATCH 1/8] Initial commit of `l10n_us_pa_hr_payroll` for 11.0. --- l10n_us_pa_hr_payroll/__init__.py | 1 + l10n_us_pa_hr_payroll/__manifest__.py | 28 +++++++ l10n_us_pa_hr_payroll/data/base.xml | 66 +++++++++++++++ l10n_us_pa_hr_payroll/data/final.xml | 20 +++++ l10n_us_pa_hr_payroll/data/rules_2018.xml | 84 +++++++++++++++++++ l10n_us_pa_hr_payroll/hr_payroll.py | 49 +++++++++++ l10n_us_pa_hr_payroll/hr_payroll_view.xml | 35 ++++++++ l10n_us_pa_hr_payroll/tests/__init__.py | 1 + .../tests/test_us_pa_payslip_2018.py | 39 +++++++++ 9 files changed, 323 insertions(+) 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 100755 l10n_us_pa_hr_payroll/data/rules_2018.xml create mode 100755 l10n_us_pa_hr_payroll/hr_payroll.py create mode 100755 l10n_us_pa_hr_payroll/hr_payroll_view.xml create mode 100755 l10n_us_pa_hr_payroll/tests/__init__.py create mode 100755 l10n_us_pa_hr_payroll/tests/test_us_pa_payslip_2018.py diff --git a/l10n_us_pa_hr_payroll/__init__.py b/l10n_us_pa_hr_payroll/__init__.py new file mode 100644 index 00000000..e99aa24a --- /dev/null +++ b/l10n_us_pa_hr_payroll/__init__.py @@ -0,0 +1 @@ +from . import hr_payroll diff --git a/l10n_us_pa_hr_payroll/__manifest__.py b/l10n_us_pa_hr_payroll/__manifest__.py new file mode 100755 index 00000000..e589dcd2 --- /dev/null +++ b/l10n_us_pa_hr_payroll/__manifest__.py @@ -0,0 +1,28 @@ +{ + 'name': 'USA - Pennsylvania - Payroll', + 'author': 'Hibou Corp. ', + 'license': 'AGPL-3', + 'category': 'Localization', + 'depends': ['l10n_us_hr_payroll'], + 'version': '11.0.2018.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': [ + 'hr_payroll_view.xml', + 'data/base.xml', + 'data/rules_2018.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..ef4615ef --- /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 + + + + + + + Pennsylvania Unemployment - Wages + PA_UNEMP_WAGES + + + + Pennsylvania Unemployment(Employee) + PA_UNEMP_EMPLOYEE + + + + + Pennsylvania Unemployment(Employer) + PA_UNEMP_COMPANY + + + + + Pennsylvania Income Withholding + PA_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..4245d2fc --- /dev/null +++ b/l10n_us_pa_hr_payroll/data/final.xml @@ -0,0 +1,20 @@ + + + + + + + US_PA_EMP + USA Pennsylvania Employee + + + + + + + diff --git a/l10n_us_pa_hr_payroll/data/rules_2018.xml b/l10n_us_pa_hr_payroll/data/rules_2018.xml new file mode 100755 index 00000000..c8dd9e46 --- /dev/null +++ b/l10n_us_pa_hr_payroll/data/rules_2018.xml @@ -0,0 +1,84 @@ + + + + + + + + + Pennsylvania Unemployment - Wages (2018) + PA_UNEMP_WAGES_2018 + python + result = (payslip.date_to[:4] == '2018') + code + +### +ytd = payslip.sum('PA_UNEMP_WAGES_2018', '2018-01-01', '2019-01-01') +ytd += contract.external_wages +remaining = 10000.0 - ytd +if remaining <= 0.0: + result = 0 +elif remaining < categories.GROSS: + result = remaining +else: + result = categories.GROSS + + + + + + + Pennsylvania Unemployment - Employee(2018) + PA_UNEMP_EMPLOYEE_2018 + python + result = (payslip.date_to[:4] == '2018') + code + +result_rate = -contract.pa_unemp_employee_rate(2018) +result = categories.PA_UNEMP_WAGES + +# result_rate of 0 implies 100% due to bug +if result_rate == 0.0: + result = 0.0 + + + + + + + + Pennsylvania Unemployment - Company(2018) + PA_UNEMP_COMPANY_2018 + python + result = (payslip.date_to[:4] == '2018') + code + +result_rate = -contract.pa_unemp_company_rate(2018) +result = categories.PA_UNEMP_WAGES + +# result_rate of 0 implies 100% due to bug +if result_rate == 0.0: + result = 0.0 + + + + + + + + + Pennsylvania Income Withholding + PA_INC_WITHHOLD_2018 + python + result = (payslip.date_to[:4] == '2018') + code + +wages = categories.GROSS +income_tax_rate = contract.pa_withhold_rate(2018) / -100.0 +result = wages * income_tax_rate + + + + + + diff --git a/l10n_us_pa_hr_payroll/hr_payroll.py b/l10n_us_pa_hr_payroll/hr_payroll.py new file mode 100755 index 00000000..33f5ea06 --- /dev/null +++ b/l10n_us_pa_hr_payroll/hr_payroll.py @@ -0,0 +1,49 @@ +from odoo import models, fields, api + + +class USPAHrContract(models.Model): + _inherit = 'hr.contract' + + pa_additional_withholding = fields.Integer(string="Additional Withholding", + default=0) + + @api.multi + def pa_unemp_company_rate(self, year): + self.ensure_one() + if self.futa_type == self.FUTA_TYPE_BASIC: + return 0.0 + + if hasattr(self.employee_id.company_id, 'pa_unemp_company_rate_' + str(year)): + return self.employee_id.company_id['pa_unemp_company_rate_' + str(year)] + + raise NotImplemented('Year (' + str(year) + ') Not implemented for US Pennsylvania') + + def pa_unemp_employee_rate(self, year): + self.ensure_one() + if self.futa_type == self.FUTA_TYPE_BASIC: + return 0.0 + + if hasattr(self.employee_id.company_id, 'pa_unemp_employee_rate_' + str(year)): + return self.employee_id.company_id['pa_unemp_employee_rate_' + str(year)] + + raise NotImplemented('Year (' + str(year) + ') Not implemented for US Pennsylvania') + + def pa_withhold_rate(self, year): + self.ensure_one() + if self.futa_type == self.FUTA_TYPE_BASIC: + return 0.0 + + if hasattr(self.employee_id.company_id, 'pa_withhold_rate_' + str(year)): + return self.employee_id.company_id['pa_withhold_rate_' + str(year)] + + raise NotImplemented('Year (' + str(year) + ') Not implemented for US Pennsylvania') + + +class PACompany(models.Model): + _inherit = 'res.company' + + # Company Unemployment rate is default rate for new employers. + pa_unemp_company_rate_2018 = fields.Float(string="Pennsylvania Unemployment Rate 2018", default=3.6890) + pa_unemp_employee_rate_2018 = fields.Float(string="Pennsylvania Unemployment Rate 2018", default=0.06) + pa_withhold_rate_2018 = fields.Float(string="Pennsylvania Income Tax Rate 2018", default=3.07) + diff --git a/l10n_us_pa_hr_payroll/hr_payroll_view.xml b/l10n_us_pa_hr_payroll/hr_payroll_view.xml new file mode 100755 index 00000000..f6d22c94 --- /dev/null +++ b/l10n_us_pa_hr_payroll/hr_payroll_view.xml @@ -0,0 +1,35 @@ + + + + + res.company.form + res.company + 64 + + + + + + + + + + + + + hr.contract.form.inherit + hr.contract + 148 + + + + + + + + + + + + + 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..e6301d7f --- /dev/null +++ b/l10n_us_pa_hr_payroll/tests/__init__.py @@ -0,0 +1 @@ +from . import test_us_pa_payslip_2018 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 new file mode 100755 index 00000000..025caf5a --- /dev/null +++ b/l10n_us_pa_hr_payroll/tests/test_us_pa_payslip_2018.py @@ -0,0 +1,39 @@ +from odoo.addons.l10n_us_hr_payroll.tests.test_us_payslip import TestUsPayslip, process_payslip +from odoo.addons.l10n_us_hr_payroll.l10n_us_hr_payroll import USHrContract + + +class TestUsPAPayslip(TestUsPayslip): + ### + # Taxes and Rates + ### + PA_UNEMP_MAX_WAGE = 10000.0 + + 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() + payslip.compute_sheet() + + 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) + From 9d2619223b59dff8c177956a4b557f096da05d9e Mon Sep 17 00:00:00 2001 From: Kristen Marie Kulha Date: Fri, 15 Jun 2018 10:12:45 -0700 Subject: [PATCH 2/8] Add README to `l10n_us_pa_hr_payroll` --- l10n_us_pa_hr_payroll/README.rst | 45 ++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 l10n_us_pa_hr_payroll/README.rst diff --git a/l10n_us_pa_hr_payroll/README.rst b/l10n_us_pa_hr_payroll/README.rst new file mode 100644 index 00000000..676423a1 --- /dev/null +++ b/l10n_us_pa_hr_payroll/README.rst @@ -0,0 +1,45 @@ +*************************************** +Hibou - US Payroll - Pennsylvania State +*************************************** + +Calculations and contribution registers for Pennsylvania State Payroll. + +For more information and add-ons, visit `Hibou.io `_. + +============= +Main Features +============= + +* New Partner for Pennsylvania Department of Revenue +* New Contribution Registers for: + * Pennsylvania Department of Revenue - Unemployment Insurance + * Pennsylvania Department of Revenue - State Income Tax +* Contract level Pennsylvania Unemployment Rate +* Contract level Pennsylvania State Income Tax Rate +* Company level Pennsylvania Unemployment Rate + + +.. image:: https://user-images.githubusercontent.com/15882954/41480481-7e9c9b16-7083-11e8-83e0-25d8f37fb2c2.png + :alt: 'Employee Contract Detail' + :width: 988 + :align: left + +USA Pennsylvania Employee Added to Contract Salary Structure Menu + +.. image:: https://user-images.githubusercontent.com/15882954/41480499-8a2d88e6-7083-11e8-88a0-2811356bca34.png + :alt: 'Computed Pay Slip Detail' + :width: 988 + :align: left + +New Payslip Categories for: + +* Pennsylvania Unemployment - Wages +* Pennsylvania Income Withholding +* Pennsylvania Unemployment - Employee +* Pennsylvania Unemployment - Employer + +======= +License +======= +Please see `LICENSE `_. +Copyright Hibou Corp. 2018 From 04c2ebb043812438c96396bef55339344a75f686 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Sun, 9 Dec 2018 11:51:01 -0800 Subject: [PATCH 3/8] Refactor to mitigate the fact that eligible 401(k) contributions reduce taxable wage (gross) but not FICA/FUTA etc. This refactor bases all/most 'wage' categories off of BASIC instead of GROSS to allow all 'Income Tax' rules to continue to be based on GROSS. --- l10n_us_pa_hr_payroll/data/rules_2018.xml | 4 ++-- l10n_us_pa_hr_payroll/tests/test_us_pa_payslip_2018.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/l10n_us_pa_hr_payroll/data/rules_2018.xml b/l10n_us_pa_hr_payroll/data/rules_2018.xml index c8dd9e46..f35d4319 100755 --- a/l10n_us_pa_hr_payroll/data/rules_2018.xml +++ b/l10n_us_pa_hr_payroll/data/rules_2018.xml @@ -18,10 +18,10 @@ ytd += contract.external_wages remaining = 10000.0 - ytd if remaining <= 0.0: result = 0 -elif remaining < categories.GROSS: +elif remaining < categories.BASIC: result = remaining else: - result = categories.GROSS + result = categories.BASIC 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 025caf5a..c047bb38 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 @@ -14,7 +14,7 @@ class TestUsPAPayslip(TestUsPayslip): wh = -127.92 employee = self._createEmployee() - employee.company_id.pa_unemp_employee_rate_2018 = 0.06~ + 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 From 54dfcf5f66f771c131d30e0444a1698cc4b839eb Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Fri, 21 Dec 2018 09:11:17 -0800 Subject: [PATCH 4/8] Fix `l10n_us_nj_hr_payroll` and `l10n_us_pa_hr_payroll` sequencing on NJ-FLI and PA-Emp.UIT --- l10n_us_pa_hr_payroll/data/rules_2018.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/l10n_us_pa_hr_payroll/data/rules_2018.xml b/l10n_us_pa_hr_payroll/data/rules_2018.xml index f35d4319..68169240 100755 --- a/l10n_us_pa_hr_payroll/data/rules_2018.xml +++ b/l10n_us_pa_hr_payroll/data/rules_2018.xml @@ -4,7 +4,7 @@ - + Pennsylvania Unemployment - Wages (2018) PA_UNEMP_WAGES_2018 @@ -26,7 +26,7 @@ else: - + Pennsylvania Unemployment - Employee(2018) PA_UNEMP_EMPLOYEE_2018 From 79e16eacb7dc00af609f8a90709db3ade3c73e13 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Sun, 6 Jan 2019 17:06:37 -0800 Subject: [PATCH 5/8] Update `l10n_us_hr_payroll` for 2019 Federal Rates and Limits. --- l10n_us_pa_hr_payroll/tests/test_us_pa_payslip_2018.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c047bb38..f6717bfe 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,5 @@ from odoo.addons.l10n_us_hr_payroll.tests.test_us_payslip import TestUsPayslip, process_payslip -from odoo.addons.l10n_us_hr_payroll.l10n_us_hr_payroll import USHrContract +from odoo.addons.l10n_us_hr_payroll.models.l10n_us_hr_payroll import USHrContract class TestUsPAPayslip(TestUsPayslip): From d35be027a69aad51acd5348d01ad9540e42af4c2 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Tue, 8 Jan 2019 11:49:20 -0800 Subject: [PATCH 6/8] Update `l10n_us_pa_hr_payroll` for 2019 Rates and Limits. --- l10n_us_pa_hr_payroll/__init__.py | 2 +- l10n_us_pa_hr_payroll/__manifest__.py | 7 ++- l10n_us_pa_hr_payroll/data/base.xml | 16 ++--- l10n_us_pa_hr_payroll/data/final.xml | 1 + l10n_us_pa_hr_payroll/data/rates.xml | 24 +++++++ .../data/{rules_2018.xml => rules.xml} | 63 +++++++++++++------ l10n_us_pa_hr_payroll/hr_payroll.py | 49 --------------- 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 | 1 + .../tests/test_us_pa_payslip_2018.py | 23 +++---- .../tests/test_us_pa_payslip_2019.py | 33 ++++++++++ .../hr_payroll_views.xml} | 15 ----- 13 files changed, 130 insertions(+), 112 deletions(-) create mode 100644 l10n_us_pa_hr_payroll/data/rates.xml rename l10n_us_pa_hr_payroll/data/{rules_2018.xml => rules.xml} (52%) delete mode 100755 l10n_us_pa_hr_payroll/hr_payroll.py 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/test_us_pa_payslip_2019.py rename l10n_us_pa_hr_payroll/{hr_payroll_view.xml => views/hr_payroll_views.xml} (52%) diff --git a/l10n_us_pa_hr_payroll/__init__.py b/l10n_us_pa_hr_payroll/__init__.py index e99aa24a..0650744f 100644 --- a/l10n_us_pa_hr_payroll/__init__.py +++ b/l10n_us_pa_hr_payroll/__init__.py @@ -1 +1 @@ -from . import hr_payroll +from . import models diff --git a/l10n_us_pa_hr_payroll/__manifest__.py b/l10n_us_pa_hr_payroll/__manifest__.py index e589dcd2..28207c9c 100755 --- a/l10n_us_pa_hr_payroll/__manifest__.py +++ b/l10n_us_pa_hr_payroll/__manifest__.py @@ -4,7 +4,7 @@ 'license': 'AGPL-3', 'category': 'Localization', 'depends': ['l10n_us_hr_payroll'], - 'version': '11.0.2018.0.0', + 'version': '11.0.2019.0.0', 'description': """ USA::Pennsylvania Payroll Rules. ================================ @@ -19,9 +19,10 @@ USA::Pennsylvania Payroll Rules. 'auto_install': False, 'website': 'https://hibou.io/', 'data': [ - 'hr_payroll_view.xml', + 'views/hr_payroll_views.xml', 'data/base.xml', - 'data/rules_2018.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 index ef4615ef..9dcc5893 100755 --- a/l10n_us_pa_hr_payroll/data/base.xml +++ b/l10n_us_pa_hr_payroll/data/base.xml @@ -41,25 +41,25 @@ - Pennsylvania Unemployment - Wages - PA_UNEMP_WAGES + Wage: ER: US-PA Pennsylvania Unemployment + WAGE_ER_US_PA_UNEMP - Pennsylvania Unemployment(Employee) - PA_UNEMP_EMPLOYEE + EE: US-PA Unemployment + EE_US_PA_UNEMP - Pennsylvania Unemployment(Employer) - PA_UNEMP_COMPANY + ER: US-PA Unemployment + ER_US_PA_UNEMP - Pennsylvania Income Withholding - PA_WITHHOLD + 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 index 4245d2fc..7f23e539 100755 --- a/l10n_us_pa_hr_payroll/data/final.xml +++ b/l10n_us_pa_hr_payroll/data/final.xml @@ -11,6 +11,7 @@ ref('hr_payroll_rules_pa_unemp_employee_2018'), ref('hr_payroll_rules_pa_unemp_company_2018'), ref('hr_payroll_rules_pa_inc_withhold_2018'), + ref('hr_payroll_rules_pa_inc_withhold_add'), ])]" name="rule_ids"/> 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_2018.xml b/l10n_us_pa_hr_payroll/data/rules.xml similarity index 52% rename from l10n_us_pa_hr_payroll/data/rules_2018.xml rename to l10n_us_pa_hr_payroll/data/rules.xml index 68169240..8ea08781 100755 --- a/l10n_us_pa_hr_payroll/data/rules_2018.xml +++ b/l10n_us_pa_hr_payroll/data/rules.xml @@ -6,16 +6,18 @@ - Pennsylvania Unemployment - Wages (2018) - PA_UNEMP_WAGES_2018 + Wage: ER: US-PA Unemployment + WAGE_ER_US_PA_UNEMP python - result = (payslip.date_to[:4] == '2018') + result = (contract.futa_type != contract.FUTA_TYPE_BASIC) code ### -ytd = payslip.sum('PA_UNEMP_WAGES_2018', '2018-01-01', '2019-01-01') +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 = 10000.0 - ytd +remaining = rate.wage_limit_year - ytd if remaining <= 0.0: result = 0 elif remaining < categories.BASIC: @@ -28,14 +30,15 @@ else: - Pennsylvania Unemployment - Employee(2018) - PA_UNEMP_EMPLOYEE_2018 + EE: US-PA Unemployment + EE_US_PA_UNEMP python - result = (payslip.date_to[:4] == '2018') + result = (contract.futa_type != contract.FUTA_TYPE_BASIC) code -result_rate = -contract.pa_unemp_employee_rate(2018) -result = categories.PA_UNEMP_WAGES +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: @@ -47,14 +50,15 @@ if result_rate == 0.0: - Pennsylvania Unemployment - Company(2018) - PA_UNEMP_COMPANY_2018 + ER: US-PA Unemployment + ER_US_PA_UNEMP python - result = (payslip.date_to[:4] == '2018') + result = (contract.futa_type != contract.FUTA_TYPE_BASIC) code -result_rate = -contract.pa_unemp_company_rate(2018) -result = categories.PA_UNEMP_WAGES +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: @@ -67,15 +71,34 @@ if result_rate == 0.0: - Pennsylvania Income Withholding - PA_INC_WITHHOLD_2018 + EE: US-PA Income Withholding + EE_US_PA_INC_WITHHOLD python - result = (payslip.date_to[:4] == '2018') + result = True code +rate = payslip.dict.get_rate('US_PA_INC_WITHHOLD') wages = categories.GROSS -income_tax_rate = contract.pa_withhold_rate(2018) / -100.0 -result = wages * income_tax_rate +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/hr_payroll.py b/l10n_us_pa_hr_payroll/hr_payroll.py deleted file mode 100755 index 33f5ea06..00000000 --- a/l10n_us_pa_hr_payroll/hr_payroll.py +++ /dev/null @@ -1,49 +0,0 @@ -from odoo import models, fields, api - - -class USPAHrContract(models.Model): - _inherit = 'hr.contract' - - pa_additional_withholding = fields.Integer(string="Additional Withholding", - default=0) - - @api.multi - def pa_unemp_company_rate(self, year): - self.ensure_one() - if self.futa_type == self.FUTA_TYPE_BASIC: - return 0.0 - - if hasattr(self.employee_id.company_id, 'pa_unemp_company_rate_' + str(year)): - return self.employee_id.company_id['pa_unemp_company_rate_' + str(year)] - - raise NotImplemented('Year (' + str(year) + ') Not implemented for US Pennsylvania') - - def pa_unemp_employee_rate(self, year): - self.ensure_one() - if self.futa_type == self.FUTA_TYPE_BASIC: - return 0.0 - - if hasattr(self.employee_id.company_id, 'pa_unemp_employee_rate_' + str(year)): - return self.employee_id.company_id['pa_unemp_employee_rate_' + str(year)] - - raise NotImplemented('Year (' + str(year) + ') Not implemented for US Pennsylvania') - - def pa_withhold_rate(self, year): - self.ensure_one() - if self.futa_type == self.FUTA_TYPE_BASIC: - return 0.0 - - if hasattr(self.employee_id.company_id, 'pa_withhold_rate_' + str(year)): - return self.employee_id.company_id['pa_withhold_rate_' + str(year)] - - raise NotImplemented('Year (' + str(year) + ') Not implemented for US Pennsylvania') - - -class PACompany(models.Model): - _inherit = 'res.company' - - # Company Unemployment rate is default rate for new employers. - pa_unemp_company_rate_2018 = fields.Float(string="Pennsylvania Unemployment Rate 2018", default=3.6890) - pa_unemp_employee_rate_2018 = fields.Float(string="Pennsylvania Unemployment Rate 2018", default=0.06) - pa_withhold_rate_2018 = fields.Float(string="Pennsylvania Income Tax Rate 2018", default=3.07) - 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 index e6301d7f..6bf37afe 100755 --- a/l10n_us_pa_hr_payroll/tests/__init__.py +++ b/l10n_us_pa_hr_payroll/tests/__init__.py @@ -1 +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/hr_payroll_view.xml b/l10n_us_pa_hr_payroll/views/hr_payroll_views.xml similarity index 52% rename from l10n_us_pa_hr_payroll/hr_payroll_view.xml rename to l10n_us_pa_hr_payroll/views/hr_payroll_views.xml index f6d22c94..08b44a88 100755 --- a/l10n_us_pa_hr_payroll/hr_payroll_view.xml +++ b/l10n_us_pa_hr_payroll/views/hr_payroll_views.xml @@ -1,21 +1,6 @@ - - res.company.form - res.company - 64 - - - - - - - - - - - hr.contract.form.inherit hr.contract From 833297c53b6902c4f0e3025ad9636dd774cb276c Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Wed, 16 Jan 2019 09:47:58 -0800 Subject: [PATCH 7/8] FIX Correct payslip wage base for payslips in two years. Add 2019 Ohio Tax Withholding rate. --- l10n_us_pa_hr_payroll/data/rules.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/l10n_us_pa_hr_payroll/data/rules.xml b/l10n_us_pa_hr_payroll/data/rules.xml index 8ea08781..3bdb8576 100755 --- a/l10n_us_pa_hr_payroll/data/rules.xml +++ b/l10n_us_pa_hr_payroll/data/rules.xml @@ -13,7 +13,7 @@ code ### -year = int(payslip.dict.date_from[:4]) +year = int(payslip.dict.date_to[: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 From 1ed9435a42a548259d7debec29c0658e49807875 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Sun, 10 Feb 2019 16:03:18 -0800 Subject: [PATCH 8/8] MIG `l10n_us_pa_hr_payroll` to 12.0 --- l10n_us_pa_hr_payroll/__manifest__.py | 2 +- l10n_us_pa_hr_payroll/data/rules.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/l10n_us_pa_hr_payroll/__manifest__.py b/l10n_us_pa_hr_payroll/__manifest__.py index 28207c9c..3f124969 100755 --- a/l10n_us_pa_hr_payroll/__manifest__.py +++ b/l10n_us_pa_hr_payroll/__manifest__.py @@ -4,7 +4,7 @@ 'license': 'AGPL-3', 'category': 'Localization', 'depends': ['l10n_us_hr_payroll'], - 'version': '11.0.2019.0.0', + 'version': '12.0.2019.0.0', 'description': """ USA::Pennsylvania Payroll Rules. ================================ diff --git a/l10n_us_pa_hr_payroll/data/rules.xml b/l10n_us_pa_hr_payroll/data/rules.xml index 3bdb8576..01be0c8d 100755 --- a/l10n_us_pa_hr_payroll/data/rules.xml +++ b/l10n_us_pa_hr_payroll/data/rules.xml @@ -13,7 +13,7 @@ code ### -year = int(payslip.dict.date_to[:4]) +year = payslip.dict.date_to.year 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