diff --git a/l10n_us_oh_hr_payroll/README.rst b/l10n_us_oh_hr_payroll/README.rst
new file mode 100644
index 00000000..1312b209
--- /dev/null
+++ b/l10n_us_oh_hr_payroll/README.rst
@@ -0,0 +1,68 @@
+*******************************
+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
+
+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
+=======
+Please see `LICENSE `_.
+Copyright Hibou Corp. 2018
diff --git a/l10n_us_oh_hr_payroll/__init__.py b/l10n_us_oh_hr_payroll/__init__.py
index 7b4348b8..c7b5ac7e 100755
--- a/l10n_us_oh_hr_payroll/__init__.py
+++ b/l10n_us_oh_hr_payroll/__init__.py
@@ -1,3 +1,3 @@
# -*- coding: utf-8 -*-
-import hr_payroll
\ No newline at end of file
+import models
diff --git a/l10n_us_oh_hr_payroll/__openerp__.py b/l10n_us_oh_hr_payroll/__openerp__.py
index d9242e4d..7b898141 100755
--- a/l10n_us_oh_hr_payroll/__openerp__.py
+++ b/l10n_us_oh_hr_payroll/__openerp__.py
@@ -5,7 +5,7 @@
'license': 'AGPL-3',
'category': 'Localization',
'depends': ['l10n_us_hr_payroll'],
- 'version': '2017.0.0',
+ 'version': '10.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 afeb141d..880160a9 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 86b9ff86..cdbdaa88 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 e2828c27..5f67e8b9 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.GROSS:
@@ -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/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_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 57261538..7fc73657 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 50%
rename from l10n_us_oh_hr_payroll/hr_payroll_view.xml
rename to l10n_us_oh_hr_payroll/views/hr_payroll_views.xml
index c4ef02b3..55a84fe4 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