From eb4de8bddcace5c2bc0e5f9da3485c8a55668319 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Mon, 30 Apr 2018 08:15:31 -0700 Subject: [PATCH 1/9] Adding all from 11.0 https://github.com/hibou-io/odoo-hr-payroll hr_payroll_holidays hr_payroll_input_name_report hr_payroll_input_report hr_payroll_payment hr_payroll_timesheet hr_payslip_line_date l10n_us_fl_hr_payroll l10n_us_hr_payroll l10n_us_mo_hr_payroll l10n_us_oh_hr_payroll l10n_us_va_hr_payroll --- l10n_us_oh_hr_payroll/__init__.py | 3 + l10n_us_oh_hr_payroll/__manifest__.py | 31 +++++ l10n_us_oh_hr_payroll/data/base.xml | 46 ++++++++ l10n_us_oh_hr_payroll/data/final.xml | 27 +++++ l10n_us_oh_hr_payroll/data/rules_2016.xml | 104 ++++++++++++++++ l10n_us_oh_hr_payroll/data/rules_2017.xml | 104 ++++++++++++++++ l10n_us_oh_hr_payroll/data/rules_2018.xml | 104 ++++++++++++++++ l10n_us_oh_hr_payroll/hr_payroll.py | 27 +++++ l10n_us_oh_hr_payroll/hr_payroll_view.xml | 33 ++++++ l10n_us_oh_hr_payroll/tests/__init__.py | 5 + .../tests/test_us_oh_payslip_2016.py | 111 ++++++++++++++++++ .../tests/test_us_oh_payslip_2017.py | 108 +++++++++++++++++ .../tests/test_us_oh_payslip_2018.py | 108 +++++++++++++++++ 13 files changed, 811 insertions(+) create mode 100755 l10n_us_oh_hr_payroll/__init__.py create mode 100755 l10n_us_oh_hr_payroll/__manifest__.py create mode 100755 l10n_us_oh_hr_payroll/data/base.xml create mode 100755 l10n_us_oh_hr_payroll/data/final.xml create mode 100755 l10n_us_oh_hr_payroll/data/rules_2016.xml create mode 100755 l10n_us_oh_hr_payroll/data/rules_2017.xml create mode 100755 l10n_us_oh_hr_payroll/data/rules_2018.xml create mode 100755 l10n_us_oh_hr_payroll/hr_payroll.py create mode 100755 l10n_us_oh_hr_payroll/hr_payroll_view.xml create mode 100755 l10n_us_oh_hr_payroll/tests/__init__.py create mode 100755 l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2016.py create mode 100755 l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2017.py create mode 100755 l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2018.py diff --git a/l10n_us_oh_hr_payroll/__init__.py b/l10n_us_oh_hr_payroll/__init__.py new file mode 100755 index 00000000..c90f169b --- /dev/null +++ b/l10n_us_oh_hr_payroll/__init__.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- + +from . import hr_payroll \ No newline at end of file diff --git a/l10n_us_oh_hr_payroll/__manifest__.py b/l10n_us_oh_hr_payroll/__manifest__.py new file mode 100755 index 00000000..61333e17 --- /dev/null +++ b/l10n_us_oh_hr_payroll/__manifest__.py @@ -0,0 +1,31 @@ +# -*- encoding: utf-8 -*- +{ + 'name': 'USA - Ohio - Payroll', + 'author': 'Hibou Corp. ', + 'license': 'AGPL-3', + 'category': 'Localization', + 'depends': ['l10n_us_hr_payroll'], + 'version': '11.0.2017.0.0', + 'description': """ +USA::Ohio Payroll Rules. +======================== + + * Ohio Department of Revenue partner + * Contribution register for Ohio DoR Unemployment + * Contribution register for Ohio DoR Income Tax Withholding + * Contract level Ohio Withholding Allowance + * Company level Ohio Unemployment Rate + """, + + 'auto_install': False, + 'website': 'https://hibou.io/', + 'data':[ + 'hr_payroll_view.xml', + 'data/base.xml', + 'data/rules_2016.xml', + 'data/rules_2017.xml', + 'data/rules_2018.xml', + 'data/final.xml', + ], + 'installable': True +} diff --git a/l10n_us_oh_hr_payroll/data/base.xml b/l10n_us_oh_hr_payroll/data/base.xml new file mode 100755 index 00000000..f09bda5a --- /dev/null +++ b/l10n_us_oh_hr_payroll/data/base.xml @@ -0,0 +1,46 @@ + + + + + + Ohio OBG - Unemployment + 1 + + + + Ohio OBG - Income Withholding + 1 + + + + Ohio Unemployment + Ohio Treasurer of State - Unemployment + + + + Ohio Income Tax Withholding + Ohio Treasurer of State - Income Tax Withholding + + + + + + + Ohio Unemployment - Wages + OH_UNEMP_WAGES + + + + Ohio Unemployment + OH_UNEMP + + + + + Ohio Income Withholding + OH_INC_WITHHOLD + + + + + diff --git a/l10n_us_oh_hr_payroll/data/final.xml b/l10n_us_oh_hr_payroll/data/final.xml new file mode 100755 index 00000000..d2e818f5 --- /dev/null +++ b/l10n_us_oh_hr_payroll/data/final.xml @@ -0,0 +1,27 @@ + + + + + + + US_OH_EMP + USA Ohio Employee + + + + + + + diff --git a/l10n_us_oh_hr_payroll/data/rules_2016.xml b/l10n_us_oh_hr_payroll/data/rules_2016.xml new file mode 100755 index 00000000..2943f200 --- /dev/null +++ b/l10n_us_oh_hr_payroll/data/rules_2016.xml @@ -0,0 +1,104 @@ + + + + + + + + + Ohio Unemployment - Wages (2016) + OH_UNEMP_WAGES_2016 + python + result = (payslip.date_to[:4] == '2016') + code + +### +ytd = payslip.sum('OH_UNEMP_WAGES_2016', '2016-01-01', '2017-01-01') +ytd += contract.external_wages +remaining = 9000.0 - ytd +if remaining <= 0.0: + result = 0 +elif remaining < categories.GROSS: + result = remaining +else: + result = categories.GROSS + + + + + + + Ohio Unemployment (2016) + OH_UNEMP_2016 + python + result = (payslip.date_to[:4] == '2016') + code + +result_rate = -contract.oh_unemp_rate(2016) +result = categories.OH_UNEMP_WAGES + +# result_rate of 0 implies 100% due to bug +if result_rate == 0.0: + result = 0.0 + + + + + + + + + Ohio Income Withholding + OH_INC_WITHHOLD_2016 + python + result = (payslip.date_to[:4] == '2016') + code + +wages = categories.GROSS +allowances = contract.oh_income_allowances +schedule_pay = contract.schedule_pay +val = 0.00 + +PP = 0 +if 'weekly' == schedule_pay: + PP = 52 +elif 'bi-weekly' == schedule_pay: + PP = 26 +elif 'semi-monthly' == schedule_pay: # impossible + PP = 24 +elif 'monthly' == schedule_pay: + PP = 12 +elif 'quarterly' == schedule_pay: + PP = 4 +elif 'semi-annually' == schedule_pay: + PP = 2 +elif 'annually' == schedule_pay: + PP = 1 +else: + raise Exception('Invalid schedule_pay="' + schedule_pay + '" for OH Income Withholding calculation') + +# Algorithm from http://www.tax.ohio.gov/Portals/0/employer_withholding/August2015Rates/WTH_OptionalComputerFormula_073015.pdf +TW = (wages * PP) - (650 * allowances) +if TW <= 5000.0: + WD = ((TW * 0.005) / PP) * 1.112 +elif TW <= 10000.0: + WD = ((((TW - 5000.0) * 0.01) + 25.0) / PP) * 1.112 +elif TW <= 15000.0: + WD = ((((TW - 10000.0) * 0.02) + 75.0) / PP) * 1.112 +elif TW <= 20000.0: + WD = ((((TW - 15000.0) * 0.025) + 175.0) / PP) * 1.112 +elif TW <= 40000.0: + WD = ((((TW - 20000.0) * 0.03) + 300.0) / PP) * 1.112 +elif TW <= 80000.0: + WD = ((((TW - 40000.0) * 0.035) + 900.0) / PP) * 1.112 +elif TW <= 100000.0: + WD = ((((TW - 80000.0) * 0.04) + 2300.0) / PP) * 1.112 +else: + WD = ((((TW - 100000.0) * 0.05) + 3100.0) / PP) * 1.112 +result = -WD + + + + + + diff --git a/l10n_us_oh_hr_payroll/data/rules_2017.xml b/l10n_us_oh_hr_payroll/data/rules_2017.xml new file mode 100755 index 00000000..c55a75f8 --- /dev/null +++ b/l10n_us_oh_hr_payroll/data/rules_2017.xml @@ -0,0 +1,104 @@ + + + + + + + + + Ohio Unemployment - Wages (2017) + OH_UNEMP_WAGES_2017 + python + result = (payslip.date_to[:4] == '2017') + code + +### +ytd = payslip.sum('OH_UNEMP_WAGES_2017', '2017-01-01', '2018-01-01') +ytd += contract.external_wages +remaining = 9000.0 - ytd +if remaining <= 0.0: + result = 0 +elif remaining < categories.GROSS: + result = remaining +else: + result = categories.GROSS + + + + + + + Ohio Unemployment (2017) + OH_UNEMP_2017 + python + result = (payslip.date_to[:4] == '2017') + code + +result_rate = -contract.oh_unemp_rate(2017) +result = categories.OH_UNEMP_WAGES + +# result_rate of 0 implies 100% due to bug +if result_rate == 0.0: + result = 0.0 + + + + + + + + + Ohio Income Withholding + OH_INC_WITHHOLD_2017 + python + result = (payslip.date_to[:4] == '2017') + code + +wages = categories.GROSS +allowances = contract.oh_income_allowances +schedule_pay = contract.schedule_pay +val = 0.00 + +PP = 0 +if 'weekly' == schedule_pay: + PP = 52 +elif 'bi-weekly' == schedule_pay: + PP = 26 +elif 'semi-monthly' == schedule_pay: # impossible + PP = 24 +elif 'monthly' == schedule_pay: + PP = 12 +elif 'quarterly' == schedule_pay: + PP = 4 +elif 'semi-annually' == schedule_pay: + PP = 2 +elif 'annually' == schedule_pay: + PP = 1 +else: + raise Exception('Invalid schedule_pay="' + schedule_pay + '" for OH Income Withholding calculation') + +# Algorithm from http://www.tax.ohio.gov/Portals/0/employer_withholding/August2015Rates/WTH_OptionalComputerFormula_073015.pdf +TW = (wages * PP) - (650 * allowances) +if TW <= 5000.0: + WD = ((TW * 0.005) / PP) * 1.112 +elif TW <= 10000.0: + WD = ((((TW - 5000.0) * 0.01) + 25.0) / PP) * 1.112 +elif TW <= 15000.0: + WD = ((((TW - 10000.0) * 0.02) + 75.0) / PP) * 1.112 +elif TW <= 20000.0: + WD = ((((TW - 15000.0) * 0.025) + 175.0) / PP) * 1.112 +elif TW <= 40000.0: + WD = ((((TW - 20000.0) * 0.03) + 300.0) / PP) * 1.112 +elif TW <= 80000.0: + WD = ((((TW - 40000.0) * 0.035) + 900.0) / PP) * 1.112 +elif TW <= 100000.0: + WD = ((((TW - 80000.0) * 0.04) + 2300.0) / PP) * 1.112 +else: + WD = ((((TW - 100000.0) * 0.05) + 3100.0) / PP) * 1.112 +result = -WD + + + + + + diff --git a/l10n_us_oh_hr_payroll/data/rules_2018.xml b/l10n_us_oh_hr_payroll/data/rules_2018.xml new file mode 100755 index 00000000..e2828c27 --- /dev/null +++ b/l10n_us_oh_hr_payroll/data/rules_2018.xml @@ -0,0 +1,104 @@ + + + + + + + + + Ohio Unemployment - Wages (2018) + OH_UNEMP_WAGES_2018 + python + result = (payslip.date_to[:4] == '2018') + code + +### +ytd = payslip.sum('OH_UNEMP_WAGES_2018', '2018-01-01', '2019-01-01') +ytd += contract.external_wages +remaining = 9500.0 - ytd +if remaining <= 0.0: + result = 0 +elif remaining < categories.GROSS: + result = remaining +else: + result = categories.GROSS + + + + + + + Ohio Unemployment (2018) + OH_UNEMP_2018 + python + result = (payslip.date_to[:4] == '2018') + code + +result_rate = -contract.oh_unemp_rate(2018) +result = categories.OH_UNEMP_WAGES + +# result_rate of 0 implies 100% due to bug +if result_rate == 0.0: + result = 0.0 + + + + + + + + + Ohio Income Withholding + OH_INC_WITHHOLD_2018 + python + result = (payslip.date_to[:4] == '2018') + code + +wages = categories.GROSS +allowances = contract.oh_income_allowances +schedule_pay = contract.schedule_pay +val = 0.00 + +PP = 0 +if 'weekly' == schedule_pay: + PP = 52 +elif 'bi-weekly' == schedule_pay: + PP = 26 +elif 'semi-monthly' == schedule_pay: # impossible + PP = 24 +elif 'monthly' == schedule_pay: + PP = 12 +elif 'quarterly' == schedule_pay: + PP = 4 +elif 'semi-annually' == schedule_pay: + PP = 2 +elif 'annually' == schedule_pay: + PP = 1 +else: + raise Exception('Invalid schedule_pay="' + schedule_pay + '" for OH Income Withholding calculation') + +# Algorithm from http://www.tax.ohio.gov/Portals/0/employer_withholding/August2015Rates/WTH_OptionalComputerFormula_073015.pdf +TW = (wages * PP) - (650 * allowances) +if TW <= 5000.0: + WD = ((TW * 0.005) / PP) * 1.112 +elif TW <= 10000.0: + WD = ((((TW - 5000.0) * 0.01) + 25.0) / PP) * 1.112 +elif TW <= 15000.0: + WD = ((((TW - 10000.0) * 0.02) + 75.0) / PP) * 1.112 +elif TW <= 20000.0: + WD = ((((TW - 15000.0) * 0.025) + 175.0) / PP) * 1.112 +elif TW <= 40000.0: + WD = ((((TW - 20000.0) * 0.03) + 300.0) / PP) * 1.112 +elif TW <= 80000.0: + WD = ((((TW - 40000.0) * 0.035) + 900.0) / PP) * 1.112 +elif TW <= 100000.0: + WD = ((((TW - 80000.0) * 0.04) + 2300.0) / PP) * 1.112 +else: + WD = ((((TW - 100000.0) * 0.05) + 3100.0) / PP) * 1.112 +result = -WD + + + + + + diff --git a/l10n_us_oh_hr_payroll/hr_payroll.py b/l10n_us_oh_hr_payroll/hr_payroll.py new file mode 100755 index 00000000..3f648563 --- /dev/null +++ b/l10n_us_oh_hr_payroll/hr_payroll.py @@ -0,0 +1,27 @@ +from odoo import models, fields, api + + +class USOHHrContract(models.Model): + _inherit = 'hr.contract' + + oh_income_allowances = fields.Integer(string='Ohio Income Allowances', default=0) + + @api.multi + def oh_unemp_rate(self, year): + self.ensure_one() + if self.futa_type == self.FUTA_TYPE_BASIC: + return 0.0 + + if hasattr(self.employee_id.company_id, 'oh_unemp_rate_' + str(year)): + return self.employee_id.company_id['oh_unemp_rate_' + str(year)] + + raise NotImplemented('Year (' + str(year) + ') Not implemented for US Ohio.') + + +class OHCompany(models.Model): + _inherit = 'res.company' + + # Defaults from :: https://jfs.ohio.gov/ouc/uctax/rates.stm + oh_unemp_rate_2016 = fields.Float(string="Ohio Unemployment Rate 2016", default=2.7) + oh_unemp_rate_2017 = fields.Float(string="Ohio Unemployment Rate 2017", default=2.7) + oh_unemp_rate_2018 = fields.Float(string="Ohio Unemployment Rate 2018", default=2.7) diff --git a/l10n_us_oh_hr_payroll/hr_payroll_view.xml b/l10n_us_oh_hr_payroll/hr_payroll_view.xml new file mode 100755 index 00000000..6e44deee --- /dev/null +++ b/l10n_us_oh_hr_payroll/hr_payroll_view.xml @@ -0,0 +1,33 @@ + + + + + res.company.form + res.company + 64 + + + + + + + + + + + + + hr.contract.form.inherit + hr.contract + 64 + + + + + + + + + + + diff --git a/l10n_us_oh_hr_payroll/tests/__init__.py b/l10n_us_oh_hr_payroll/tests/__init__.py new file mode 100755 index 00000000..71db8ace --- /dev/null +++ b/l10n_us_oh_hr_payroll/tests/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- + +from . import test_us_oh_payslip_2016 +from . import test_us_oh_payslip_2017 +from . import test_us_oh_payslip_2018 diff --git a/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2016.py b/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2016.py new file mode 100755 index 00000000..bbf0713e --- /dev/null +++ b/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2016.py @@ -0,0 +1,111 @@ +# -*- coding: utf-8 -*- + +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 TestUsOhPayslip(TestUsPayslip): + ### + # 2016 Taxes and Rates + ### + + def test_2016_taxes(self): + salary = 5000.0 + + ## tax maximums + OH_UNEMP_MAX_WAGE = 9000.0 + + ## For formula here + # http://www.tax.ohio.gov/Portals/0/employer_withholding/August2015Rates/WTH_OptionalComputerFormula_073015.pdf + TW = salary * 12 # = 60000 + WD = ((TW - 40000) * 0.035 + 900) / 12 * 1.112 + + + employee = self._createEmployee() + employee.company_id.oh_unemp_rate_2016 = 2.7 + + contract = self._createContract(employee, salary, struct_id=self.ref('l10n_us_oh_hr_payroll.hr_payroll_salary_structure_us_oh_employee')) + + ## tax rates + OH_UNEMP = contract.oh_unemp_rate(2016) / -100.0 + + self._log('2016 Ohio tax first payslip:') + payslip = self._createPayslip(employee, '2016-01-01', '2016-01-31') + + payslip.compute_sheet() + + cats = self._getCategories(payslip) + + self.assertPayrollEqual(cats['OH_UNEMP_WAGES'], salary) + self.assertPayrollEqual(cats['OH_UNEMP'], cats['OH_UNEMP_WAGES'] * OH_UNEMP) + self.assertPayrollEqual(cats['OH_INC_WITHHOLD'], -WD) + + process_payslip(payslip) + + # Make a new payslip, this one will have maximums + + remaining_oh_unemp_wages = OH_UNEMP_MAX_WAGE - salary if (OH_UNEMP_MAX_WAGE - 2*salary < salary) else salary + + self._log('2016 Ohio tax second payslip:') + payslip = self._createPayslip(employee, '2016-02-01', '2016-02-29') # 2016 is a leap year + + payslip.compute_sheet() + + cats = self._getCategories(payslip) + + self.assertPayrollEqual(cats['OH_UNEMP_WAGES'], remaining_oh_unemp_wages) + self.assertPayrollEqual(cats['OH_UNEMP'], remaining_oh_unemp_wages * OH_UNEMP) + + + def test_2016_taxes_with_external(self): + salary = 5000.0 + external_wages = 6000.0 + + employee = self._createEmployee() + employee.company_id.oh_unemp_rate_2016 = 2.8 + + contract = self._createContract(employee, salary, external_wages=external_wages, + struct_id=self.ref('l10n_us_oh_hr_payroll.hr_payroll_salary_structure_us_oh_employee')) + ## tax maximums + OH_UNEMP_MAX_WAGE = 9000.0 + + ## tax rates + OH_UNEMP = contract.oh_unemp_rate(2016) / -100.0 + + self._log('2016 Ohio_external tax first payslip:') + payslip = self._createPayslip(employee, '2016-01-01', '2016-01-31') + + payslip.compute_sheet() + + cats = self._getCategories(payslip) + + self.assertPayrollEqual(cats['OH_UNEMP_WAGES'], OH_UNEMP_MAX_WAGE - external_wages) + self.assertPayrollEqual(cats['OH_UNEMP'], cats['OH_UNEMP_WAGES'] * OH_UNEMP) + + + def test_2016_taxes_with_state_exempt(self): + salary = 5000.0 + external_wages = 6000.0 + + employee = self._createEmployee() + employee.company_id.oh_unemp_rate_2016 = 2.9 + + contract = self._createContract(employee, salary, external_wages=external_wages, struct_id=self.ref( + 'l10n_us_oh_hr_payroll.hr_payroll_salary_structure_us_oh_employee'), futa_type=USHrContract.FUTA_TYPE_BASIC) + ## tax maximums + OH_UNEMP_MAX_WAGE = 9000.0 + + ## tax rates + OH_UNEMP = contract.oh_unemp_rate(2016) / -100.0 + + self.assertPayrollEqual(OH_UNEMP, 0.0) + + self._log('2016 Ohio exempt tax first payslip:') + payslip = self._createPayslip(employee, '2016-01-01', '2016-01-31') + + payslip.compute_sheet() + + cats = self._getCategories(payslip) + + self.assertPayrollEqual(cats['OH_UNEMP_WAGES'], OH_UNEMP_MAX_WAGE - external_wages) + self.assertPayrollEqual(cats['OH_UNEMP'], cats['OH_UNEMP_WAGES'] * OH_UNEMP) \ No newline at end of file diff --git a/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2017.py b/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2017.py new file mode 100755 index 00000000..3d94fd6f --- /dev/null +++ b/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2017.py @@ -0,0 +1,108 @@ +# -*- coding: utf-8 -*- + +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 TestUsOhPayslip(TestUsPayslip): + ### + # Taxes and Rates + ### + OH_UNEMP_MAX_WAGE = 9000.0 + + def test_2017_taxes(self): + salary = 5000.0 + + # For formula here + # http://www.tax.ohio.gov/Portals/0/employer_withholding/August2015Rates/WTH_OptionalComputerFormula_073015.pdf + tw = salary * 12 # = 60000 + wd = ((tw - 40000) * 0.035 + 900) / 12 * 1.112 + + employee = self._createEmployee() + employee.company_id.oh_unemp_rate_2017 = 2.7 + + contract = self._createContract(employee, salary, struct_id=self.ref('l10n_us_oh_hr_payroll.hr_payroll_salary_structure_us_oh_employee')) + + # tax rates + oh_unemp = contract.oh_unemp_rate(2017) / -100.0 + + self._log('2016 Ohio tax last payslip:') + payslip = self._createPayslip(employee, '2016-12-01', '2016-12-31') + payslip.compute_sheet() + process_payslip(payslip) + + self._log('2017 Ohio tax first payslip:') + payslip = self._createPayslip(employee, '2017-01-01', '2017-01-31') + + payslip.compute_sheet() + + cats = self._getCategories(payslip) + + self.assertPayrollEqual(cats['OH_UNEMP_WAGES'], salary) + self.assertPayrollEqual(cats['OH_UNEMP'], cats['OH_UNEMP_WAGES'] * oh_unemp) + self.assertPayrollEqual(cats['OH_INC_WITHHOLD'], -wd) + + process_payslip(payslip) + + # Make a new payslip, this one will have maximums + + remaining_oh_unemp_wages = self.OH_UNEMP_MAX_WAGE - salary if (self.OH_UNEMP_MAX_WAGE - 2*salary < salary) \ + else salary + + self._log('2017 Ohio tax second payslip:') + payslip = self._createPayslip(employee, '2017-02-01', '2017-02-28') + + payslip.compute_sheet() + + cats = self._getCategories(payslip) + + self.assertPayrollEqual(cats['OH_UNEMP_WAGES'], remaining_oh_unemp_wages) + self.assertPayrollEqual(cats['OH_UNEMP'], remaining_oh_unemp_wages * oh_unemp) + + def test_2017_taxes_with_external(self): + salary = 5000.0 + external_wages = 6000.0 + + employee = self._createEmployee() + employee.company_id.oh_unemp_rate_2017 = 2.8 + + contract = self._createContract(employee, salary, external_wages=external_wages, + struct_id=self.ref('l10n_us_oh_hr_payroll.hr_payroll_salary_structure_us_oh_employee')) + + # tax rates + oh_unemp = contract.oh_unemp_rate(2017) / -100.0 + + self._log('2017 Ohio_external tax first payslip:') + payslip = self._createPayslip(employee, '2017-01-01', '2017-01-31') + + payslip.compute_sheet() + + cats = self._getCategories(payslip) + + self.assertPayrollEqual(cats['OH_UNEMP_WAGES'], self.OH_UNEMP_MAX_WAGE - external_wages) + self.assertPayrollEqual(cats['OH_UNEMP'], cats['OH_UNEMP_WAGES'] * oh_unemp) + + def test_2017_taxes_with_state_exempt(self): + salary = 5000.0 + external_wages = 6000.0 + + employee = self._createEmployee() + employee.company_id.oh_unemp_rate_2017 = 2.9 + + contract = self._createContract(employee, salary, external_wages=external_wages, struct_id=self.ref( + 'l10n_us_oh_hr_payroll.hr_payroll_salary_structure_us_oh_employee'), futa_type=USHrContract.FUTA_TYPE_BASIC) + + # tax rates + oh_unemp = contract.oh_unemp_rate(2017) / -100.0 + + self.assertPayrollEqual(oh_unemp, 0.0) + + self._log('2017 Ohio exempt tax first payslip:') + payslip = self._createPayslip(employee, '2017-01-01', '2017-01-31') + + payslip.compute_sheet() + + cats = self._getCategories(payslip) + + self.assertPayrollEqual(cats['OH_UNEMP_WAGES'], self.OH_UNEMP_MAX_WAGE - external_wages) + self.assertPayrollEqual(cats['OH_UNEMP'], cats['OH_UNEMP_WAGES'] * oh_unemp) diff --git a/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2018.py b/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2018.py new file mode 100755 index 00000000..dbf05fc5 --- /dev/null +++ b/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2018.py @@ -0,0 +1,108 @@ +# -*- coding: utf-8 -*- + +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 TestUsOhPayslip(TestUsPayslip): + ### + # Taxes and Rates + ### + OH_UNEMP_MAX_WAGE = 9500.0 + + def test_2018_taxes(self): + salary = 5000.0 + + # For formula here + # http://www.tax.ohio.gov/Portals/0/employer_withholding/August2015Rates/WTH_OptionalComputerFormula_073015.pdf + tw = salary * 12 # = 60000 + wd = ((tw - 40000) * 0.035 + 900) / 12 * 1.112 + + employee = self._createEmployee() + employee.company_id.oh_unemp_rate_2018 = 2.7 + + contract = self._createContract(employee, salary, struct_id=self.ref('l10n_us_oh_hr_payroll.hr_payroll_salary_structure_us_oh_employee')) + + # tax rates + oh_unemp = contract.oh_unemp_rate(2018) / -100.0 + + self._log('2016 Ohio tax last payslip:') + payslip = self._createPayslip(employee, '2016-12-01', '2016-12-31') + payslip.compute_sheet() + process_payslip(payslip) + + self._log('2018 Ohio tax first payslip:') + payslip = self._createPayslip(employee, '2018-01-01', '2018-01-31') + + payslip.compute_sheet() + + cats = self._getCategories(payslip) + + self.assertPayrollEqual(cats['OH_UNEMP_WAGES'], salary) + self.assertPayrollEqual(cats['OH_UNEMP'], cats['OH_UNEMP_WAGES'] * oh_unemp) + self.assertPayrollEqual(cats['OH_INC_WITHHOLD'], -wd) + + process_payslip(payslip) + + # Make a new payslip, this one will have maximums + + remaining_oh_unemp_wages = self.OH_UNEMP_MAX_WAGE - salary if (self.OH_UNEMP_MAX_WAGE - 2*salary < salary) \ + else salary + + self._log('2018 Ohio tax second payslip:') + payslip = self._createPayslip(employee, '2018-02-01', '2018-02-28') + + payslip.compute_sheet() + + cats = self._getCategories(payslip) + + self.assertPayrollEqual(cats['OH_UNEMP_WAGES'], remaining_oh_unemp_wages) + self.assertPayrollEqual(cats['OH_UNEMP'], remaining_oh_unemp_wages * oh_unemp) + + def test_2018_taxes_with_external(self): + salary = 5000.0 + external_wages = 6000.0 + + employee = self._createEmployee() + employee.company_id.oh_unemp_rate_2018 = 2.8 + + contract = self._createContract(employee, salary, external_wages=external_wages, + struct_id=self.ref('l10n_us_oh_hr_payroll.hr_payroll_salary_structure_us_oh_employee')) + + # tax rates + oh_unemp = contract.oh_unemp_rate(2018) / -100.0 + + self._log('2018 Ohio_external tax first payslip:') + payslip = self._createPayslip(employee, '2018-01-01', '2018-01-31') + + payslip.compute_sheet() + + cats = self._getCategories(payslip) + + self.assertPayrollEqual(cats['OH_UNEMP_WAGES'], self.OH_UNEMP_MAX_WAGE - external_wages) + self.assertPayrollEqual(cats['OH_UNEMP'], cats['OH_UNEMP_WAGES'] * oh_unemp) + + def test_2018_taxes_with_state_exempt(self): + salary = 5000.0 + external_wages = 6000.0 + + employee = self._createEmployee() + employee.company_id.oh_unemp_rate_2018 = 2.9 + + contract = self._createContract(employee, salary, external_wages=external_wages, struct_id=self.ref( + 'l10n_us_oh_hr_payroll.hr_payroll_salary_structure_us_oh_employee'), futa_type=USHrContract.FUTA_TYPE_BASIC) + + # tax rates + oh_unemp = contract.oh_unemp_rate(2018) / -100.0 + + self.assertPayrollEqual(oh_unemp, 0.0) + + self._log('2018 Ohio exempt tax first payslip:') + payslip = self._createPayslip(employee, '2018-01-01', '2018-01-31') + + payslip.compute_sheet() + + cats = self._getCategories(payslip) + + self.assertPayrollEqual(cats['OH_UNEMP_WAGES'], self.OH_UNEMP_MAX_WAGE - external_wages) + self.assertPayrollEqual(cats['OH_UNEMP'], cats['OH_UNEMP_WAGES'] * oh_unemp) From bcd2a81760d89a23f95d31c585ee821750b40bb4 Mon Sep 17 00:00:00 2001 From: Kristen Marie Kulha Date: Thu, 3 May 2018 15:24:28 -0700 Subject: [PATCH 2/9] Improved US Payroll form views --- l10n_us_oh_hr_payroll/hr_payroll_view.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/l10n_us_oh_hr_payroll/hr_payroll_view.xml b/l10n_us_oh_hr_payroll/hr_payroll_view.xml index 6e44deee..ea1e722d 100755 --- a/l10n_us_oh_hr_payroll/hr_payroll_view.xml +++ b/l10n_us_oh_hr_payroll/hr_payroll_view.xml @@ -19,12 +19,14 @@ hr.contract.form.inherit hr.contract - 64 + 130 - - + + + + From eb13f1e61cfa5fe16b861d60ca87dcb910df69df Mon Sep 17 00:00:00 2001 From: Kristen Marie Kulha Date: Fri, 15 Jun 2018 11:39:16 -0700 Subject: [PATCH 3/9] Add REAME to `l10n_us_oh_hr_payroll` --- l10n_us_oh_hr_payroll/README.rst | 42 ++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 l10n_us_oh_hr_payroll/README.rst diff --git a/l10n_us_oh_hr_payroll/README.rst b/l10n_us_oh_hr_payroll/README.rst new file mode 100644 index 00000000..f3ff923e --- /dev/null +++ b/l10n_us_oh_hr_payroll/README.rst @@ -0,0 +1,42 @@ +******************************* +Hibou - US Payroll - Ohio State +******************************* + +Calculations and contribution registers for Ohio State Payroll. + +For more information and add-ons, visit `Hibou.io `_. + +============= +Main Features +============= + +* New Ohio Department of Revenue partner +* Contribution Registers for: + * Ohio Department of Revenue - Unemployment + * Ohio Department of Revenue - Income Tax withholding +* Contract level Ohio Withholding Allowance +* Company level Ohio Unemployment Rate + +.. image:: https://user-images.githubusercontent.com/15882954/41481725-e1cbd3c4-7087-11e8-8bf7-84843bb2f943.png + :alt: 'Employee Contract Detail' + :width: 988 + :align: left + +USA Ohio Employee added to Contract Salary Structure Menu + +.. image:: https://user-images.githubusercontent.com/15882954/41481743-f1eceb4e-7087-11e8-8d09-dd45551a3fa4.png + :alt: 'Computed Pay Slip Detail' + :width: 988 + :align: left + +New Payslip Categories for: + +* Ohio Income Withholding +* Ohio Unemployment - Wages +* Ohio Unemployment + +======= +License +======= +Please see `LICENSE `_. +Copyright Hibou Corp. 2018 From 979a691e7b158bb16b5014984f1a798ee4da565b Mon Sep 17 00:00:00 2001 From: Kristen Marie Kulha Date: Mon, 9 Jul 2018 16:31:53 -0700 Subject: [PATCH 4/9] Added `oh_additional_withholding` field to `l10n_us_oh_hr_payroll`. --- l10n_us_oh_hr_payroll/hr_payroll.py | 1 + l10n_us_oh_hr_payroll/hr_payroll_view.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/l10n_us_oh_hr_payroll/hr_payroll.py b/l10n_us_oh_hr_payroll/hr_payroll.py index 3f648563..ee321819 100755 --- a/l10n_us_oh_hr_payroll/hr_payroll.py +++ b/l10n_us_oh_hr_payroll/hr_payroll.py @@ -5,6 +5,7 @@ class USOHHrContract(models.Model): _inherit = 'hr.contract' oh_income_allowances = fields.Integer(string='Ohio Income Allowances', default=0) + oh_additional_withholding = fields.Float(string="Additional Withholding", default=0.0) @api.multi def oh_unemp_rate(self, year): diff --git a/l10n_us_oh_hr_payroll/hr_payroll_view.xml b/l10n_us_oh_hr_payroll/hr_payroll_view.xml index ea1e722d..d5710c08 100755 --- a/l10n_us_oh_hr_payroll/hr_payroll_view.xml +++ b/l10n_us_oh_hr_payroll/hr_payroll_view.xml @@ -26,6 +26,7 @@ + From 1a87c6142e31d5ed7b5c947915396d595f805ba0 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Sun, 9 Dec 2018 11:51:01 -0800 Subject: [PATCH 5/9] 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_oh_hr_payroll/data/rules_2018.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/l10n_us_oh_hr_payroll/data/rules_2018.xml b/l10n_us_oh_hr_payroll/data/rules_2018.xml index e2828c27..88d28eb8 100755 --- a/l10n_us_oh_hr_payroll/data/rules_2018.xml +++ b/l10n_us_oh_hr_payroll/data/rules_2018.xml @@ -18,10 +18,10 @@ ytd += contract.external_wages remaining = 9500.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 From 24b4242e233ecd3ec9f3bc653085f3cfe1ca32b3 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Sun, 6 Jan 2019 17:06:37 -0800 Subject: [PATCH 6/9] Update `l10n_us_hr_payroll` for 2019 Federal Rates and Limits. --- l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2016.py | 2 +- l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2017.py | 2 +- l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2018.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2016.py b/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2016.py index bbf0713e..5de137ec 100755 --- a/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2016.py +++ b/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2016.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- 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 TestUsOhPayslip(TestUsPayslip): diff --git a/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2017.py b/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2017.py index 3d94fd6f..9bfa433b 100755 --- a/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2017.py +++ b/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2017.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- 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 TestUsOhPayslip(TestUsPayslip): diff --git a/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2018.py b/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2018.py index dbf05fc5..ac7ae8f9 100755 --- a/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2018.py +++ b/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2018.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- 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 TestUsOhPayslip(TestUsPayslip): From 35d612366bff670573cba9239571d9fc4fab83fa Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Tue, 8 Jan 2019 09:45:59 -0800 Subject: [PATCH 7/9] Update `l10n_us_oh_hr_payroll` for 2019 Rates and Limits. --- l10n_us_oh_hr_payroll/README.rst | 26 ++++ l10n_us_oh_hr_payroll/__init__.py | 2 +- l10n_us_oh_hr_payroll/__manifest__.py | 9 +- l10n_us_oh_hr_payroll/data/base.xml | 12 +- l10n_us_oh_hr_payroll/data/final.xml | 8 -- l10n_us_oh_hr_payroll/data/rates.xml | 19 +++ .../data/{rules_2018.xml => rules.xml} | 29 +++-- l10n_us_oh_hr_payroll/data/rules_2016.xml | 104 ---------------- l10n_us_oh_hr_payroll/data/rules_2017.xml | 104 ---------------- l10n_us_oh_hr_payroll/hr_payroll.py | 28 ----- l10n_us_oh_hr_payroll/models/__init__.py | 1 + l10n_us_oh_hr_payroll/models/hr_payroll.py | 8 ++ l10n_us_oh_hr_payroll/tests/__init__.py | 3 +- .../tests/test_us_oh_payslip_2016.py | 111 ------------------ .../tests/test_us_oh_payslip_2018.py | 39 ++---- ...lip_2017.py => test_us_oh_payslip_2019.py} | 63 ++++------ .../hr_payroll_views.xml} | 15 --- 17 files changed, 120 insertions(+), 461 deletions(-) create mode 100755 l10n_us_oh_hr_payroll/data/rates.xml rename l10n_us_oh_hr_payroll/data/{rules_2018.xml => rules.xml} (76%) delete mode 100755 l10n_us_oh_hr_payroll/data/rules_2016.xml delete mode 100755 l10n_us_oh_hr_payroll/data/rules_2017.xml delete mode 100755 l10n_us_oh_hr_payroll/hr_payroll.py create mode 100644 l10n_us_oh_hr_payroll/models/__init__.py create mode 100755 l10n_us_oh_hr_payroll/models/hr_payroll.py delete mode 100755 l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2016.py rename l10n_us_oh_hr_payroll/tests/{test_us_oh_payslip_2017.py => test_us_oh_payslip_2019.py} (50%) rename l10n_us_oh_hr_payroll/{hr_payroll_view.xml => views/hr_payroll_views.xml} (56%) diff --git a/l10n_us_oh_hr_payroll/README.rst b/l10n_us_oh_hr_payroll/README.rst index f3ff923e..1312b209 100644 --- a/l10n_us_oh_hr_payroll/README.rst +++ b/l10n_us_oh_hr_payroll/README.rst @@ -35,6 +35,32 @@ New Payslip Categories for: * Ohio Unemployment - Wages * Ohio Unemployment +Upgrading to 2019 +========================== + +If you were using this prior to January 2019, then you will need to run the following +migration script. + +Odoo Shell code:: + + def migrate_rule_name(rule_id): + main = env.ref(rule_id) + old_2017 = env.ref(rule_id.replace('2018', '2017')) + old_2016 = env.ref(rule_id.replace('2018', '2016')) + lines = env['hr.payslip.line'].search([('salary_rule_id', 'in', [old_2017.id, old_2016.id,])]) + lines.write({'salary_rule_id': main.id}) + + rules = [ + 'l10n_us_oh_hr_payroll.hr_payroll_rules_oh_unemp_wages_2018', + 'l10n_us_oh_hr_payroll.hr_payroll_rules_oh_unemp_2018', + 'l10n_us_oh_hr_payroll.hr_payroll_rules_oh_inc_withhold_2018', + ] + for rule_id in rules: + migrate_rule_name(rule_id) + + env.cr.commit() + + ======= License ======= diff --git a/l10n_us_oh_hr_payroll/__init__.py b/l10n_us_oh_hr_payroll/__init__.py index c90f169b..cde864ba 100755 --- a/l10n_us_oh_hr_payroll/__init__.py +++ b/l10n_us_oh_hr_payroll/__init__.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- -from . import hr_payroll \ No newline at end of file +from . import models diff --git a/l10n_us_oh_hr_payroll/__manifest__.py b/l10n_us_oh_hr_payroll/__manifest__.py index 61333e17..11d30094 100755 --- a/l10n_us_oh_hr_payroll/__manifest__.py +++ b/l10n_us_oh_hr_payroll/__manifest__.py @@ -5,7 +5,7 @@ 'license': 'AGPL-3', 'category': 'Localization', 'depends': ['l10n_us_hr_payroll'], - 'version': '11.0.2017.0.0', + 'version': '11.0.2019.0.0', 'description': """ USA::Ohio Payroll Rules. ======================== @@ -20,11 +20,10 @@ USA::Ohio Payroll Rules. 'auto_install': False, 'website': 'https://hibou.io/', 'data':[ - 'hr_payroll_view.xml', + 'views/hr_payroll_views.xml', 'data/base.xml', - 'data/rules_2016.xml', - 'data/rules_2017.xml', - 'data/rules_2018.xml', + 'data/rates.xml', + 'data/rules.xml', 'data/final.xml', ], 'installable': True diff --git a/l10n_us_oh_hr_payroll/data/base.xml b/l10n_us_oh_hr_payroll/data/base.xml index f09bda5a..3ca54fc3 100755 --- a/l10n_us_oh_hr_payroll/data/base.xml +++ b/l10n_us_oh_hr_payroll/data/base.xml @@ -26,19 +26,19 @@ - Ohio Unemployment - Wages - OH_UNEMP_WAGES + Wage: US-OH Unemployment + WAGE_US_OH_UNEMP - Ohio Unemployment - OH_UNEMP + ER: US-OH Unemployment + ER_US_OH_UNEMP - Ohio Income Withholding - OH_INC_WITHHOLD + EE: US-OH Income Withholding + EE_US_OH_INC_WITHHOLD diff --git a/l10n_us_oh_hr_payroll/data/final.xml b/l10n_us_oh_hr_payroll/data/final.xml index d2e818f5..6a94e0a5 100755 --- a/l10n_us_oh_hr_payroll/data/final.xml +++ b/l10n_us_oh_hr_payroll/data/final.xml @@ -7,14 +7,6 @@ US_OH_EMP USA Ohio Employee + + + + US Ohio Unemployment + US_OH_UNEMP + 2.7 + 2018-01-01 + + + + US Ohio Unemployment + US_OH_UNEMP + 2.7 + 2019-01-01 + + + + diff --git a/l10n_us_oh_hr_payroll/data/rules_2018.xml b/l10n_us_oh_hr_payroll/data/rules.xml similarity index 76% rename from l10n_us_oh_hr_payroll/data/rules_2018.xml rename to l10n_us_oh_hr_payroll/data/rules.xml index 88d28eb8..372cbc54 100755 --- a/l10n_us_oh_hr_payroll/data/rules_2018.xml +++ b/l10n_us_oh_hr_payroll/data/rules.xml @@ -6,16 +6,18 @@ - Ohio Unemployment - Wages (2018) - OH_UNEMP_WAGES_2018 + Wage: US-OH Unemployment + WAGE_US_OH_UNEMP python - result = (payslip.date_to[:4] == '2018') + result = (contract.futa_type != contract.FUTA_TYPE_BASIC) code ### -ytd = payslip.sum('OH_UNEMP_WAGES_2018', '2018-01-01', '2019-01-01') +rate = payslip.dict.get_rate('US_OH_UNEMP') +year = int(payslip.dict.date_from[:4]) +ytd = payslip.sum('WAGE_US_OH_UNEMP', str(year) + '-01-01', str(year+1) + '-01-01') ytd += contract.external_wages -remaining = 9500.0 - ytd +remaining = rate.wage_limit_year - ytd if remaining <= 0.0: result = 0 elif remaining < categories.BASIC: @@ -28,14 +30,15 @@ else: - Ohio Unemployment (2018) - OH_UNEMP_2018 + ER: US-OH Unemployment + ER_US_OH_UNEMP python - result = (payslip.date_to[:4] == '2018') + result = (contract.futa_type != contract.FUTA_TYPE_BASIC) code -result_rate = -contract.oh_unemp_rate(2018) -result = categories.OH_UNEMP_WAGES +rate = payslip.dict.get_rate('US_OH_UNEMP') +result_rate = -rate.rate +result = categories.WAGE_US_OH_UNEMP # result_rate of 0 implies 100% due to bug if result_rate == 0.0: @@ -48,10 +51,10 @@ if result_rate == 0.0: - Ohio Income Withholding - OH_INC_WITHHOLD_2018 + EE: US-OH Income Withholding + EE_US_OH_INC_WITHHOLD python - result = (payslip.date_to[:4] == '2018') + result = True code wages = categories.GROSS diff --git a/l10n_us_oh_hr_payroll/data/rules_2016.xml b/l10n_us_oh_hr_payroll/data/rules_2016.xml deleted file mode 100755 index 2943f200..00000000 --- a/l10n_us_oh_hr_payroll/data/rules_2016.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - Ohio Unemployment - Wages (2016) - OH_UNEMP_WAGES_2016 - python - result = (payslip.date_to[:4] == '2016') - code - -### -ytd = payslip.sum('OH_UNEMP_WAGES_2016', '2016-01-01', '2017-01-01') -ytd += contract.external_wages -remaining = 9000.0 - ytd -if remaining <= 0.0: - result = 0 -elif remaining < categories.GROSS: - result = remaining -else: - result = categories.GROSS - - - - - - - Ohio Unemployment (2016) - OH_UNEMP_2016 - python - result = (payslip.date_to[:4] == '2016') - code - -result_rate = -contract.oh_unemp_rate(2016) -result = categories.OH_UNEMP_WAGES - -# result_rate of 0 implies 100% due to bug -if result_rate == 0.0: - result = 0.0 - - - - - - - - - Ohio Income Withholding - OH_INC_WITHHOLD_2016 - python - result = (payslip.date_to[:4] == '2016') - code - -wages = categories.GROSS -allowances = contract.oh_income_allowances -schedule_pay = contract.schedule_pay -val = 0.00 - -PP = 0 -if 'weekly' == schedule_pay: - PP = 52 -elif 'bi-weekly' == schedule_pay: - PP = 26 -elif 'semi-monthly' == schedule_pay: # impossible - PP = 24 -elif 'monthly' == schedule_pay: - PP = 12 -elif 'quarterly' == schedule_pay: - PP = 4 -elif 'semi-annually' == schedule_pay: - PP = 2 -elif 'annually' == schedule_pay: - PP = 1 -else: - raise Exception('Invalid schedule_pay="' + schedule_pay + '" for OH Income Withholding calculation') - -# Algorithm from http://www.tax.ohio.gov/Portals/0/employer_withholding/August2015Rates/WTH_OptionalComputerFormula_073015.pdf -TW = (wages * PP) - (650 * allowances) -if TW <= 5000.0: - WD = ((TW * 0.005) / PP) * 1.112 -elif TW <= 10000.0: - WD = ((((TW - 5000.0) * 0.01) + 25.0) / PP) * 1.112 -elif TW <= 15000.0: - WD = ((((TW - 10000.0) * 0.02) + 75.0) / PP) * 1.112 -elif TW <= 20000.0: - WD = ((((TW - 15000.0) * 0.025) + 175.0) / PP) * 1.112 -elif TW <= 40000.0: - WD = ((((TW - 20000.0) * 0.03) + 300.0) / PP) * 1.112 -elif TW <= 80000.0: - WD = ((((TW - 40000.0) * 0.035) + 900.0) / PP) * 1.112 -elif TW <= 100000.0: - WD = ((((TW - 80000.0) * 0.04) + 2300.0) / PP) * 1.112 -else: - WD = ((((TW - 100000.0) * 0.05) + 3100.0) / PP) * 1.112 -result = -WD - - - - - - diff --git a/l10n_us_oh_hr_payroll/data/rules_2017.xml b/l10n_us_oh_hr_payroll/data/rules_2017.xml deleted file mode 100755 index c55a75f8..00000000 --- a/l10n_us_oh_hr_payroll/data/rules_2017.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - Ohio Unemployment - Wages (2017) - OH_UNEMP_WAGES_2017 - python - result = (payslip.date_to[:4] == '2017') - code - -### -ytd = payslip.sum('OH_UNEMP_WAGES_2017', '2017-01-01', '2018-01-01') -ytd += contract.external_wages -remaining = 9000.0 - ytd -if remaining <= 0.0: - result = 0 -elif remaining < categories.GROSS: - result = remaining -else: - result = categories.GROSS - - - - - - - Ohio Unemployment (2017) - OH_UNEMP_2017 - python - result = (payslip.date_to[:4] == '2017') - code - -result_rate = -contract.oh_unemp_rate(2017) -result = categories.OH_UNEMP_WAGES - -# result_rate of 0 implies 100% due to bug -if result_rate == 0.0: - result = 0.0 - - - - - - - - - Ohio Income Withholding - OH_INC_WITHHOLD_2017 - python - result = (payslip.date_to[:4] == '2017') - code - -wages = categories.GROSS -allowances = contract.oh_income_allowances -schedule_pay = contract.schedule_pay -val = 0.00 - -PP = 0 -if 'weekly' == schedule_pay: - PP = 52 -elif 'bi-weekly' == schedule_pay: - PP = 26 -elif 'semi-monthly' == schedule_pay: # impossible - PP = 24 -elif 'monthly' == schedule_pay: - PP = 12 -elif 'quarterly' == schedule_pay: - PP = 4 -elif 'semi-annually' == schedule_pay: - PP = 2 -elif 'annually' == schedule_pay: - PP = 1 -else: - raise Exception('Invalid schedule_pay="' + schedule_pay + '" for OH Income Withholding calculation') - -# Algorithm from http://www.tax.ohio.gov/Portals/0/employer_withholding/August2015Rates/WTH_OptionalComputerFormula_073015.pdf -TW = (wages * PP) - (650 * allowances) -if TW <= 5000.0: - WD = ((TW * 0.005) / PP) * 1.112 -elif TW <= 10000.0: - WD = ((((TW - 5000.0) * 0.01) + 25.0) / PP) * 1.112 -elif TW <= 15000.0: - WD = ((((TW - 10000.0) * 0.02) + 75.0) / PP) * 1.112 -elif TW <= 20000.0: - WD = ((((TW - 15000.0) * 0.025) + 175.0) / PP) * 1.112 -elif TW <= 40000.0: - WD = ((((TW - 20000.0) * 0.03) + 300.0) / PP) * 1.112 -elif TW <= 80000.0: - WD = ((((TW - 40000.0) * 0.035) + 900.0) / PP) * 1.112 -elif TW <= 100000.0: - WD = ((((TW - 80000.0) * 0.04) + 2300.0) / PP) * 1.112 -else: - WD = ((((TW - 100000.0) * 0.05) + 3100.0) / PP) * 1.112 -result = -WD - - - - - - diff --git a/l10n_us_oh_hr_payroll/hr_payroll.py b/l10n_us_oh_hr_payroll/hr_payroll.py deleted file mode 100755 index ee321819..00000000 --- a/l10n_us_oh_hr_payroll/hr_payroll.py +++ /dev/null @@ -1,28 +0,0 @@ -from odoo import models, fields, api - - -class USOHHrContract(models.Model): - _inherit = 'hr.contract' - - oh_income_allowances = fields.Integer(string='Ohio Income Allowances', default=0) - oh_additional_withholding = fields.Float(string="Additional Withholding", default=0.0) - - @api.multi - def oh_unemp_rate(self, year): - self.ensure_one() - if self.futa_type == self.FUTA_TYPE_BASIC: - return 0.0 - - if hasattr(self.employee_id.company_id, 'oh_unemp_rate_' + str(year)): - return self.employee_id.company_id['oh_unemp_rate_' + str(year)] - - raise NotImplemented('Year (' + str(year) + ') Not implemented for US Ohio.') - - -class OHCompany(models.Model): - _inherit = 'res.company' - - # Defaults from :: https://jfs.ohio.gov/ouc/uctax/rates.stm - oh_unemp_rate_2016 = fields.Float(string="Ohio Unemployment Rate 2016", default=2.7) - oh_unemp_rate_2017 = fields.Float(string="Ohio Unemployment Rate 2017", default=2.7) - oh_unemp_rate_2018 = fields.Float(string="Ohio Unemployment Rate 2018", default=2.7) diff --git a/l10n_us_oh_hr_payroll/models/__init__.py b/l10n_us_oh_hr_payroll/models/__init__.py new file mode 100644 index 00000000..e99aa24a --- /dev/null +++ b/l10n_us_oh_hr_payroll/models/__init__.py @@ -0,0 +1 @@ +from . import hr_payroll diff --git a/l10n_us_oh_hr_payroll/models/hr_payroll.py b/l10n_us_oh_hr_payroll/models/hr_payroll.py new file mode 100755 index 00000000..9917337f --- /dev/null +++ b/l10n_us_oh_hr_payroll/models/hr_payroll.py @@ -0,0 +1,8 @@ +from odoo import models, fields, api + + +class USOHHrContract(models.Model): + _inherit = 'hr.contract' + + oh_income_allowances = fields.Integer(string='Ohio Income Allowances', default=0) + oh_additional_withholding = fields.Float(string="Additional Withholding", default=0.0) diff --git a/l10n_us_oh_hr_payroll/tests/__init__.py b/l10n_us_oh_hr_payroll/tests/__init__.py index 71db8ace..c9dbd2ee 100755 --- a/l10n_us_oh_hr_payroll/tests/__init__.py +++ b/l10n_us_oh_hr_payroll/tests/__init__.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from . import test_us_oh_payslip_2016 -from . import test_us_oh_payslip_2017 from . import test_us_oh_payslip_2018 +from . import test_us_oh_payslip_2019 diff --git a/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2016.py b/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2016.py deleted file mode 100755 index 5de137ec..00000000 --- a/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2016.py +++ /dev/null @@ -1,111 +0,0 @@ -# -*- coding: utf-8 -*- - -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 TestUsOhPayslip(TestUsPayslip): - ### - # 2016 Taxes and Rates - ### - - def test_2016_taxes(self): - salary = 5000.0 - - ## tax maximums - OH_UNEMP_MAX_WAGE = 9000.0 - - ## For formula here - # http://www.tax.ohio.gov/Portals/0/employer_withholding/August2015Rates/WTH_OptionalComputerFormula_073015.pdf - TW = salary * 12 # = 60000 - WD = ((TW - 40000) * 0.035 + 900) / 12 * 1.112 - - - employee = self._createEmployee() - employee.company_id.oh_unemp_rate_2016 = 2.7 - - contract = self._createContract(employee, salary, struct_id=self.ref('l10n_us_oh_hr_payroll.hr_payroll_salary_structure_us_oh_employee')) - - ## tax rates - OH_UNEMP = contract.oh_unemp_rate(2016) / -100.0 - - self._log('2016 Ohio tax first payslip:') - payslip = self._createPayslip(employee, '2016-01-01', '2016-01-31') - - payslip.compute_sheet() - - cats = self._getCategories(payslip) - - self.assertPayrollEqual(cats['OH_UNEMP_WAGES'], salary) - self.assertPayrollEqual(cats['OH_UNEMP'], cats['OH_UNEMP_WAGES'] * OH_UNEMP) - self.assertPayrollEqual(cats['OH_INC_WITHHOLD'], -WD) - - process_payslip(payslip) - - # Make a new payslip, this one will have maximums - - remaining_oh_unemp_wages = OH_UNEMP_MAX_WAGE - salary if (OH_UNEMP_MAX_WAGE - 2*salary < salary) else salary - - self._log('2016 Ohio tax second payslip:') - payslip = self._createPayslip(employee, '2016-02-01', '2016-02-29') # 2016 is a leap year - - payslip.compute_sheet() - - cats = self._getCategories(payslip) - - self.assertPayrollEqual(cats['OH_UNEMP_WAGES'], remaining_oh_unemp_wages) - self.assertPayrollEqual(cats['OH_UNEMP'], remaining_oh_unemp_wages * OH_UNEMP) - - - def test_2016_taxes_with_external(self): - salary = 5000.0 - external_wages = 6000.0 - - employee = self._createEmployee() - employee.company_id.oh_unemp_rate_2016 = 2.8 - - contract = self._createContract(employee, salary, external_wages=external_wages, - struct_id=self.ref('l10n_us_oh_hr_payroll.hr_payroll_salary_structure_us_oh_employee')) - ## tax maximums - OH_UNEMP_MAX_WAGE = 9000.0 - - ## tax rates - OH_UNEMP = contract.oh_unemp_rate(2016) / -100.0 - - self._log('2016 Ohio_external tax first payslip:') - payslip = self._createPayslip(employee, '2016-01-01', '2016-01-31') - - payslip.compute_sheet() - - cats = self._getCategories(payslip) - - self.assertPayrollEqual(cats['OH_UNEMP_WAGES'], OH_UNEMP_MAX_WAGE - external_wages) - self.assertPayrollEqual(cats['OH_UNEMP'], cats['OH_UNEMP_WAGES'] * OH_UNEMP) - - - def test_2016_taxes_with_state_exempt(self): - salary = 5000.0 - external_wages = 6000.0 - - employee = self._createEmployee() - employee.company_id.oh_unemp_rate_2016 = 2.9 - - contract = self._createContract(employee, salary, external_wages=external_wages, struct_id=self.ref( - 'l10n_us_oh_hr_payroll.hr_payroll_salary_structure_us_oh_employee'), futa_type=USHrContract.FUTA_TYPE_BASIC) - ## tax maximums - OH_UNEMP_MAX_WAGE = 9000.0 - - ## tax rates - OH_UNEMP = contract.oh_unemp_rate(2016) / -100.0 - - self.assertPayrollEqual(OH_UNEMP, 0.0) - - self._log('2016 Ohio exempt tax first payslip:') - payslip = self._createPayslip(employee, '2016-01-01', '2016-01-31') - - payslip.compute_sheet() - - cats = self._getCategories(payslip) - - self.assertPayrollEqual(cats['OH_UNEMP_WAGES'], OH_UNEMP_MAX_WAGE - external_wages) - self.assertPayrollEqual(cats['OH_UNEMP'], cats['OH_UNEMP_WAGES'] * OH_UNEMP) \ No newline at end of file diff --git a/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2018.py b/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2018.py index ac7ae8f9..30c735b1 100755 --- a/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2018.py +++ b/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2018.py @@ -9,6 +9,7 @@ class TestUsOhPayslip(TestUsPayslip): # Taxes and Rates ### OH_UNEMP_MAX_WAGE = 9500.0 + OH_UNEMP = -2.7 / 100.0 def test_2018_taxes(self): salary = 5000.0 @@ -19,15 +20,11 @@ class TestUsOhPayslip(TestUsPayslip): wd = ((tw - 40000) * 0.035 + 900) / 12 * 1.112 employee = self._createEmployee() - employee.company_id.oh_unemp_rate_2018 = 2.7 contract = self._createContract(employee, salary, struct_id=self.ref('l10n_us_oh_hr_payroll.hr_payroll_salary_structure_us_oh_employee')) - # tax rates - oh_unemp = contract.oh_unemp_rate(2018) / -100.0 - - self._log('2016 Ohio tax last payslip:') - payslip = self._createPayslip(employee, '2016-12-01', '2016-12-31') + self._log('2017 Ohio tax last payslip:') + payslip = self._createPayslip(employee, '2017-12-01', '2017-12-31') payslip.compute_sheet() process_payslip(payslip) @@ -38,9 +35,9 @@ class TestUsOhPayslip(TestUsPayslip): cats = self._getCategories(payslip) - self.assertPayrollEqual(cats['OH_UNEMP_WAGES'], salary) - self.assertPayrollEqual(cats['OH_UNEMP'], cats['OH_UNEMP_WAGES'] * oh_unemp) - self.assertPayrollEqual(cats['OH_INC_WITHHOLD'], -wd) + self.assertPayrollEqual(cats['WAGE_US_OH_UNEMP'], salary) + self.assertPayrollEqual(cats['ER_US_OH_UNEMP'], cats['WAGE_US_OH_UNEMP'] * self.OH_UNEMP) + self.assertPayrollEqual(cats['EE_US_OH_INC_WITHHOLD'], -wd) process_payslip(payslip) @@ -56,22 +53,18 @@ class TestUsOhPayslip(TestUsPayslip): cats = self._getCategories(payslip) - self.assertPayrollEqual(cats['OH_UNEMP_WAGES'], remaining_oh_unemp_wages) - self.assertPayrollEqual(cats['OH_UNEMP'], remaining_oh_unemp_wages * oh_unemp) + self.assertPayrollEqual(cats['WAGE_US_OH_UNEMP'], remaining_oh_unemp_wages) + self.assertPayrollEqual(cats['ER_US_OH_UNEMP'], remaining_oh_unemp_wages * self.OH_UNEMP) def test_2018_taxes_with_external(self): salary = 5000.0 external_wages = 6000.0 employee = self._createEmployee() - employee.company_id.oh_unemp_rate_2018 = 2.8 contract = self._createContract(employee, salary, external_wages=external_wages, struct_id=self.ref('l10n_us_oh_hr_payroll.hr_payroll_salary_structure_us_oh_employee')) - # tax rates - oh_unemp = contract.oh_unemp_rate(2018) / -100.0 - self._log('2018 Ohio_external tax first payslip:') payslip = self._createPayslip(employee, '2018-01-01', '2018-01-31') @@ -79,24 +72,17 @@ class TestUsOhPayslip(TestUsPayslip): cats = self._getCategories(payslip) - self.assertPayrollEqual(cats['OH_UNEMP_WAGES'], self.OH_UNEMP_MAX_WAGE - external_wages) - self.assertPayrollEqual(cats['OH_UNEMP'], cats['OH_UNEMP_WAGES'] * oh_unemp) + self.assertPayrollEqual(cats['WAGE_US_OH_UNEMP'], self.OH_UNEMP_MAX_WAGE - external_wages) + self.assertPayrollEqual(cats['ER_US_OH_UNEMP'], cats['WAGE_US_OH_UNEMP'] * self.OH_UNEMP) def test_2018_taxes_with_state_exempt(self): salary = 5000.0 external_wages = 6000.0 employee = self._createEmployee() - employee.company_id.oh_unemp_rate_2018 = 2.9 - contract = self._createContract(employee, salary, external_wages=external_wages, struct_id=self.ref( 'l10n_us_oh_hr_payroll.hr_payroll_salary_structure_us_oh_employee'), futa_type=USHrContract.FUTA_TYPE_BASIC) - # tax rates - oh_unemp = contract.oh_unemp_rate(2018) / -100.0 - - self.assertPayrollEqual(oh_unemp, 0.0) - self._log('2018 Ohio exempt tax first payslip:') payslip = self._createPayslip(employee, '2018-01-01', '2018-01-31') @@ -104,5 +90,6 @@ class TestUsOhPayslip(TestUsPayslip): cats = self._getCategories(payslip) - self.assertPayrollEqual(cats['OH_UNEMP_WAGES'], self.OH_UNEMP_MAX_WAGE - external_wages) - self.assertPayrollEqual(cats['OH_UNEMP'], cats['OH_UNEMP_WAGES'] * oh_unemp) + # FUTA_TYPE_BASIC + self.assertPayrollEqual(cats.get('WAGE_US_OH_UNEMP', 0.0), 0.0) + self.assertPayrollEqual(cats.get('ER_US_OH_UNEMP', 0.0), cats.get('WAGE_US_OH_UNEMP', 0.0) * 0.0) diff --git a/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2017.py b/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2019.py similarity index 50% rename from l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2017.py rename to l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2019.py index 9bfa433b..ee597c5e 100755 --- a/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2017.py +++ b/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2019.py @@ -8,9 +8,10 @@ class TestUsOhPayslip(TestUsPayslip): ### # Taxes and Rates ### - OH_UNEMP_MAX_WAGE = 9000.0 + OH_UNEMP_MAX_WAGE = 9500.0 + OH_UNEMP = -2.7 / 100.0 - def test_2017_taxes(self): + def test_2019_taxes(self): salary = 5000.0 # For formula here @@ -19,28 +20,24 @@ class TestUsOhPayslip(TestUsPayslip): wd = ((tw - 40000) * 0.035 + 900) / 12 * 1.112 employee = self._createEmployee() - employee.company_id.oh_unemp_rate_2017 = 2.7 contract = self._createContract(employee, salary, struct_id=self.ref('l10n_us_oh_hr_payroll.hr_payroll_salary_structure_us_oh_employee')) - # tax rates - oh_unemp = contract.oh_unemp_rate(2017) / -100.0 - - self._log('2016 Ohio tax last payslip:') - payslip = self._createPayslip(employee, '2016-12-01', '2016-12-31') + self._log('2018 Ohio tax last payslip:') + payslip = self._createPayslip(employee, '2018-12-01', '2018-12-31') payslip.compute_sheet() process_payslip(payslip) - self._log('2017 Ohio tax first payslip:') - payslip = self._createPayslip(employee, '2017-01-01', '2017-01-31') + self._log('2019 Ohio tax first payslip:') + payslip = self._createPayslip(employee, '2019-01-01', '2019-01-31') payslip.compute_sheet() cats = self._getCategories(payslip) - self.assertPayrollEqual(cats['OH_UNEMP_WAGES'], salary) - self.assertPayrollEqual(cats['OH_UNEMP'], cats['OH_UNEMP_WAGES'] * oh_unemp) - self.assertPayrollEqual(cats['OH_INC_WITHHOLD'], -wd) + self.assertPayrollEqual(cats['WAGE_US_OH_UNEMP'], salary) + self.assertPayrollEqual(cats['ER_US_OH_UNEMP'], cats['WAGE_US_OH_UNEMP'] * self.OH_UNEMP) + self.assertPayrollEqual(cats['EE_US_OH_INC_WITHHOLD'], -wd) process_payslip(payslip) @@ -49,60 +46,50 @@ class TestUsOhPayslip(TestUsPayslip): remaining_oh_unemp_wages = self.OH_UNEMP_MAX_WAGE - salary if (self.OH_UNEMP_MAX_WAGE - 2*salary < salary) \ else salary - self._log('2017 Ohio tax second payslip:') - payslip = self._createPayslip(employee, '2017-02-01', '2017-02-28') + self._log('2019 Ohio tax second payslip:') + payslip = self._createPayslip(employee, '2019-02-01', '2019-02-28') payslip.compute_sheet() cats = self._getCategories(payslip) - self.assertPayrollEqual(cats['OH_UNEMP_WAGES'], remaining_oh_unemp_wages) - self.assertPayrollEqual(cats['OH_UNEMP'], remaining_oh_unemp_wages * oh_unemp) + self.assertPayrollEqual(cats['WAGE_US_OH_UNEMP'], remaining_oh_unemp_wages) + self.assertPayrollEqual(cats['ER_US_OH_UNEMP'], remaining_oh_unemp_wages * self.OH_UNEMP) - def test_2017_taxes_with_external(self): + def test_2019_taxes_with_external(self): salary = 5000.0 external_wages = 6000.0 employee = self._createEmployee() - employee.company_id.oh_unemp_rate_2017 = 2.8 contract = self._createContract(employee, salary, external_wages=external_wages, struct_id=self.ref('l10n_us_oh_hr_payroll.hr_payroll_salary_structure_us_oh_employee')) - # tax rates - oh_unemp = contract.oh_unemp_rate(2017) / -100.0 - - self._log('2017 Ohio_external tax first payslip:') - payslip = self._createPayslip(employee, '2017-01-01', '2017-01-31') + self._log('2019 Ohio_external tax first payslip:') + payslip = self._createPayslip(employee, '2019-01-01', '2019-01-31') payslip.compute_sheet() cats = self._getCategories(payslip) - self.assertPayrollEqual(cats['OH_UNEMP_WAGES'], self.OH_UNEMP_MAX_WAGE - external_wages) - self.assertPayrollEqual(cats['OH_UNEMP'], cats['OH_UNEMP_WAGES'] * oh_unemp) + self.assertPayrollEqual(cats['WAGE_US_OH_UNEMP'], self.OH_UNEMP_MAX_WAGE - external_wages) + self.assertPayrollEqual(cats['ER_US_OH_UNEMP'], cats['WAGE_US_OH_UNEMP'] * self.OH_UNEMP) - def test_2017_taxes_with_state_exempt(self): + def test_2019_taxes_with_state_exempt(self): salary = 5000.0 external_wages = 6000.0 employee = self._createEmployee() - employee.company_id.oh_unemp_rate_2017 = 2.9 - contract = self._createContract(employee, salary, external_wages=external_wages, struct_id=self.ref( 'l10n_us_oh_hr_payroll.hr_payroll_salary_structure_us_oh_employee'), futa_type=USHrContract.FUTA_TYPE_BASIC) - # tax rates - oh_unemp = contract.oh_unemp_rate(2017) / -100.0 - - self.assertPayrollEqual(oh_unemp, 0.0) - - self._log('2017 Ohio exempt tax first payslip:') - payslip = self._createPayslip(employee, '2017-01-01', '2017-01-31') + self._log('2019 Ohio exempt tax first payslip:') + payslip = self._createPayslip(employee, '2019-01-01', '2019-01-31') payslip.compute_sheet() cats = self._getCategories(payslip) - self.assertPayrollEqual(cats['OH_UNEMP_WAGES'], self.OH_UNEMP_MAX_WAGE - external_wages) - self.assertPayrollEqual(cats['OH_UNEMP'], cats['OH_UNEMP_WAGES'] * oh_unemp) + # FUTA_TYPE_BASIC + self.assertPayrollEqual(cats.get('WAGE_US_OH_UNEMP', 0.0), 0.0) + self.assertPayrollEqual(cats.get('ER_US_OH_UNEMP', 0.0), cats.get('WAGE_US_OH_UNEMP', 0.0) * 0.0) diff --git a/l10n_us_oh_hr_payroll/hr_payroll_view.xml b/l10n_us_oh_hr_payroll/views/hr_payroll_views.xml similarity index 56% rename from l10n_us_oh_hr_payroll/hr_payroll_view.xml rename to l10n_us_oh_hr_payroll/views/hr_payroll_views.xml index d5710c08..19f084f4 100755 --- a/l10n_us_oh_hr_payroll/hr_payroll_view.xml +++ b/l10n_us_oh_hr_payroll/views/hr_payroll_views.xml @@ -1,21 +1,6 @@ - - res.company.form - res.company - 64 - - - - - - - - - - - hr.contract.form.inherit hr.contract From 5654a569e8fd8169144ce750eb85eeceabaab64c Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Wed, 16 Jan 2019 09:47:58 -0800 Subject: [PATCH 8/9] FIX Correct payslip wage base for payslips in two years. Add 2019 Ohio Tax Withholding rate. --- l10n_us_oh_hr_payroll/data/rules.xml | 57 +++++++++++++------ .../tests/test_us_oh_payslip_2019.py | 2 +- 2 files changed, 40 insertions(+), 19 deletions(-) diff --git a/l10n_us_oh_hr_payroll/data/rules.xml b/l10n_us_oh_hr_payroll/data/rules.xml index 372cbc54..56175d24 100755 --- a/l10n_us_oh_hr_payroll/data/rules.xml +++ b/l10n_us_oh_hr_payroll/data/rules.xml @@ -14,7 +14,7 @@ ### rate = payslip.dict.get_rate('US_OH_UNEMP') -year = int(payslip.dict.date_from[:4]) +year = int(payslip.dict.date_to[:4]) ytd = payslip.sum('WAGE_US_OH_UNEMP', str(year) + '-01-01', str(year+1) + '-01-01') ytd += contract.external_wages remaining = rate.wage_limit_year - ytd @@ -57,6 +57,7 @@ if result_rate == 0.0: result = True code +year = int(payslip.dict.date_to[:4]) wages = categories.GROSS allowances = contract.oh_income_allowances schedule_pay = contract.schedule_pay @@ -80,24 +81,44 @@ elif 'annually' == schedule_pay: else: raise Exception('Invalid schedule_pay="' + schedule_pay + '" for OH Income Withholding calculation') -# Algorithm from http://www.tax.ohio.gov/Portals/0/employer_withholding/August2015Rates/WTH_OptionalComputerFormula_073015.pdf -TW = (wages * PP) - (650 * allowances) -if TW <= 5000.0: - WD = ((TW * 0.005) / PP) * 1.112 -elif TW <= 10000.0: - WD = ((((TW - 5000.0) * 0.01) + 25.0) / PP) * 1.112 -elif TW <= 15000.0: - WD = ((((TW - 10000.0) * 0.02) + 75.0) / PP) * 1.112 -elif TW <= 20000.0: - WD = ((((TW - 15000.0) * 0.025) + 175.0) / PP) * 1.112 -elif TW <= 40000.0: - WD = ((((TW - 20000.0) * 0.03) + 300.0) / PP) * 1.112 -elif TW <= 80000.0: - WD = ((((TW - 40000.0) * 0.035) + 900.0) / PP) * 1.112 -elif TW <= 100000.0: - WD = ((((TW - 80000.0) * 0.04) + 2300.0) / PP) * 1.112 +# Algorithm from https://www.tax.ohio.gov/Portals/0/employer_withholding/2019%20tables/WTH_OptionalComputerFormula_2019.pdf +if year == 2018: + TW = (wages * PP) - (650 * allowances) + if TW <= 5000.0: + WD = ((TW * 0.005) / PP) * 1.112 + elif TW <= 10000.0: + WD = ((((TW - 5000.0) * 0.01) + 25.0) / PP) * 1.112 + elif TW <= 15000.0: + WD = ((((TW - 10000.0) * 0.02) + 75.0) / PP) * 1.112 + elif TW <= 20000.0: + WD = ((((TW - 15000.0) * 0.025) + 175.0) / PP) * 1.112 + elif TW <= 40000.0: + WD = ((((TW - 20000.0) * 0.03) + 300.0) / PP) * 1.112 + elif TW <= 80000.0: + WD = ((((TW - 40000.0) * 0.035) + 900.0) / PP) * 1.112 + elif TW <= 100000.0: + WD = ((((TW - 80000.0) * 0.04) + 2300.0) / PP) * 1.112 + else: + WD = ((((TW - 100000.0) * 0.05) + 3100.0) / PP) * 1.112 else: - WD = ((((TW - 100000.0) * 0.05) + 3100.0) / PP) * 1.112 + TW = (wages * PP) - (650 * allowances) + if TW <= 5000.0: + WD = ((TW * 0.005) / PP) * 1.112 + elif TW <= 10000.0: + WD = ((((TW - 5000.0) * 0.01) + 25.0) / PP) * 1.075 + elif TW <= 15000.0: + WD = ((((TW - 10000.0) * 0.02) + 75.0) / PP) * 1.075 + elif TW <= 20000.0: + WD = ((((TW - 15000.0) * 0.025) + 175.0) / PP) * 1.075 + elif TW <= 40000.0: + WD = ((((TW - 20000.0) * 0.03) + 300.0) / PP) * 1.075 + elif TW <= 80000.0: + WD = ((((TW - 40000.0) * 0.035) + 900.0) / PP) * 1.075 + elif TW <= 100000.0: + WD = ((((TW - 80000.0) * 0.04) + 2300.0) / PP) * 1.075 + else: + WD = ((((TW - 100000.0) * 0.05) + 3100.0) / PP) * 1.075 + result = -WD diff --git a/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2019.py b/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2019.py index ee597c5e..1687d654 100755 --- a/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2019.py +++ b/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2019.py @@ -17,7 +17,7 @@ class TestUsOhPayslip(TestUsPayslip): # For formula here # http://www.tax.ohio.gov/Portals/0/employer_withholding/August2015Rates/WTH_OptionalComputerFormula_073015.pdf tw = salary * 12 # = 60000 - wd = ((tw - 40000) * 0.035 + 900) / 12 * 1.112 + wd = ((tw - 40000) * 0.035 + 900) / 12 * 1.075 employee = self._createEmployee() From 47f5bd4f203f47b15866b5987792a2b44d6b5049 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Sun, 10 Feb 2019 15:43:08 -0800 Subject: [PATCH 9/9] MIG `l10n_us_oh_hr_payroll` to 12.0 --- l10n_us_oh_hr_payroll/__init__.py | 2 -- l10n_us_oh_hr_payroll/__manifest__.py | 3 +-- l10n_us_oh_hr_payroll/data/rules.xml | 4 ++-- l10n_us_oh_hr_payroll/tests/__init__.py | 2 -- l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2018.py | 2 -- l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2019.py | 2 -- 6 files changed, 3 insertions(+), 12 deletions(-) diff --git a/l10n_us_oh_hr_payroll/__init__.py b/l10n_us_oh_hr_payroll/__init__.py index cde864ba..0650744f 100755 --- a/l10n_us_oh_hr_payroll/__init__.py +++ b/l10n_us_oh_hr_payroll/__init__.py @@ -1,3 +1 @@ -# -*- coding: utf-8 -*- - from . import models diff --git a/l10n_us_oh_hr_payroll/__manifest__.py b/l10n_us_oh_hr_payroll/__manifest__.py index 11d30094..ea602ecd 100755 --- a/l10n_us_oh_hr_payroll/__manifest__.py +++ b/l10n_us_oh_hr_payroll/__manifest__.py @@ -1,11 +1,10 @@ -# -*- encoding: utf-8 -*- { 'name': 'USA - Ohio - Payroll', 'author': 'Hibou Corp. ', 'license': 'AGPL-3', 'category': 'Localization', 'depends': ['l10n_us_hr_payroll'], - 'version': '11.0.2019.0.0', + 'version': '12.0.2019.0.0', 'description': """ USA::Ohio Payroll Rules. ======================== diff --git a/l10n_us_oh_hr_payroll/data/rules.xml b/l10n_us_oh_hr_payroll/data/rules.xml index 56175d24..db60a9c1 100755 --- a/l10n_us_oh_hr_payroll/data/rules.xml +++ b/l10n_us_oh_hr_payroll/data/rules.xml @@ -14,7 +14,7 @@ ### rate = payslip.dict.get_rate('US_OH_UNEMP') -year = int(payslip.dict.date_to[:4]) +year = payslip.dict.date_to.year ytd = payslip.sum('WAGE_US_OH_UNEMP', str(year) + '-01-01', str(year+1) + '-01-01') ytd += contract.external_wages remaining = rate.wage_limit_year - ytd @@ -57,7 +57,7 @@ if result_rate == 0.0: result = True code -year = int(payslip.dict.date_to[:4]) +year = payslip.dict.date_to.year wages = categories.GROSS allowances = contract.oh_income_allowances schedule_pay = contract.schedule_pay diff --git a/l10n_us_oh_hr_payroll/tests/__init__.py b/l10n_us_oh_hr_payroll/tests/__init__.py index c9dbd2ee..d7ed2c2e 100755 --- a/l10n_us_oh_hr_payroll/tests/__init__.py +++ b/l10n_us_oh_hr_payroll/tests/__init__.py @@ -1,4 +1,2 @@ -# -*- coding: utf-8 -*- - from . import test_us_oh_payslip_2018 from . import test_us_oh_payslip_2019 diff --git a/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2018.py b/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2018.py index 30c735b1..b4b7f1af 100755 --- a/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2018.py +++ b/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2018.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - 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 diff --git a/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2019.py b/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2019.py index 1687d654..0783ad36 100755 --- a/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2019.py +++ b/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2019.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - 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