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