diff --git a/l10n_us_pa_hr_payroll/__init__.py b/l10n_us_pa_hr_payroll/__init__.py
index e99aa24a..0650744f 100644
--- a/l10n_us_pa_hr_payroll/__init__.py
+++ b/l10n_us_pa_hr_payroll/__init__.py
@@ -1 +1 @@
-from . import hr_payroll
+from . import models
diff --git a/l10n_us_pa_hr_payroll/__manifest__.py b/l10n_us_pa_hr_payroll/__manifest__.py
index e589dcd2..28207c9c 100755
--- a/l10n_us_pa_hr_payroll/__manifest__.py
+++ b/l10n_us_pa_hr_payroll/__manifest__.py
@@ -4,7 +4,7 @@
'license': 'AGPL-3',
'category': 'Localization',
'depends': ['l10n_us_hr_payroll'],
- 'version': '11.0.2018.0.0',
+ 'version': '11.0.2019.0.0',
'description': """
USA::Pennsylvania Payroll Rules.
================================
@@ -19,9 +19,10 @@ USA::Pennsylvania Payroll Rules.
'auto_install': False,
'website': 'https://hibou.io/',
'data': [
- 'hr_payroll_view.xml',
+ 'views/hr_payroll_views.xml',
'data/base.xml',
- 'data/rules_2018.xml',
+ 'data/rates.xml',
+ 'data/rules.xml',
'data/final.xml',
],
'installable': True
diff --git a/l10n_us_pa_hr_payroll/data/base.xml b/l10n_us_pa_hr_payroll/data/base.xml
index ef4615ef..9dcc5893 100755
--- a/l10n_us_pa_hr_payroll/data/base.xml
+++ b/l10n_us_pa_hr_payroll/data/base.xml
@@ -41,25 +41,25 @@
- Pennsylvania Unemployment - Wages
- PA_UNEMP_WAGES
+ Wage: ER: US-PA Pennsylvania Unemployment
+ WAGE_ER_US_PA_UNEMP
- Pennsylvania Unemployment(Employee)
- PA_UNEMP_EMPLOYEE
+ EE: US-PA Unemployment
+ EE_US_PA_UNEMP
- Pennsylvania Unemployment(Employer)
- PA_UNEMP_COMPANY
+ ER: US-PA Unemployment
+ ER_US_PA_UNEMP
- Pennsylvania Income Withholding
- PA_WITHHOLD
+ EE: US-PA Income Withholding
+ EE_US_PA_INC_WITHHOLD
diff --git a/l10n_us_pa_hr_payroll/data/final.xml b/l10n_us_pa_hr_payroll/data/final.xml
index 4245d2fc..7f23e539 100755
--- a/l10n_us_pa_hr_payroll/data/final.xml
+++ b/l10n_us_pa_hr_payroll/data/final.xml
@@ -11,6 +11,7 @@
ref('hr_payroll_rules_pa_unemp_employee_2018'),
ref('hr_payroll_rules_pa_unemp_company_2018'),
ref('hr_payroll_rules_pa_inc_withhold_2018'),
+ ref('hr_payroll_rules_pa_inc_withhold_add'),
])]" name="rule_ids"/>
diff --git a/l10n_us_pa_hr_payroll/data/rates.xml b/l10n_us_pa_hr_payroll/data/rates.xml
new file mode 100644
index 00000000..9143d25b
--- /dev/null
+++ b/l10n_us_pa_hr_payroll/data/rates.xml
@@ -0,0 +1,24 @@
+
+
+
+
+ US Pennsylvania Unemployment (Company)
+ ER_US_PA_UNEMP
+ 3.6890
+ 2018-01-01
+
+
+
+ UUS Pennsylvania Unemployment (Employee)
+ EE_US_PA_UNEMP
+ 0.06
+ 2018-01-01
+
+
+ US Pennsylvania Income Tax Rate (default)
+ US_PA_INC_WITHHOLD
+ 3.07
+ 2018-01-01
+
+
+
\ No newline at end of file
diff --git a/l10n_us_pa_hr_payroll/data/rules_2018.xml b/l10n_us_pa_hr_payroll/data/rules.xml
similarity index 52%
rename from l10n_us_pa_hr_payroll/data/rules_2018.xml
rename to l10n_us_pa_hr_payroll/data/rules.xml
index 68169240..8ea08781 100755
--- a/l10n_us_pa_hr_payroll/data/rules_2018.xml
+++ b/l10n_us_pa_hr_payroll/data/rules.xml
@@ -6,16 +6,18 @@
- Pennsylvania Unemployment - Wages (2018)
- PA_UNEMP_WAGES_2018
+ Wage: ER: US-PA Unemployment
+ WAGE_ER_US_PA_UNEMP
python
- result = (payslip.date_to[:4] == '2018')
+ result = (contract.futa_type != contract.FUTA_TYPE_BASIC)
code
###
-ytd = payslip.sum('PA_UNEMP_WAGES_2018', '2018-01-01', '2019-01-01')
+year = int(payslip.dict.date_from[:4])
+rate = payslip.dict.get_rate('ER_US_PA_UNEMP')
+ytd = payslip.sum('WAGE_ER_US_PA_UNEMP', str(year) + '-01-01', str(year+1) + '-01-01')
ytd += contract.external_wages
-remaining = 10000.0 - ytd
+remaining = rate.wage_limit_year - ytd
if remaining <= 0.0:
result = 0
elif remaining < categories.BASIC:
@@ -28,14 +30,15 @@ else:
- Pennsylvania Unemployment - Employee(2018)
- PA_UNEMP_EMPLOYEE_2018
+ EE: US-PA Unemployment
+ EE_US_PA_UNEMP
python
- result = (payslip.date_to[:4] == '2018')
+ result = (contract.futa_type != contract.FUTA_TYPE_BASIC)
code
-result_rate = -contract.pa_unemp_employee_rate(2018)
-result = categories.PA_UNEMP_WAGES
+rate = payslip.dict.get_rate('EE_US_PA_UNEMP')
+result_rate = -rate.rate
+result = categories.BASIC
# result_rate of 0 implies 100% due to bug
if result_rate == 0.0:
@@ -47,14 +50,15 @@ if result_rate == 0.0:
- Pennsylvania Unemployment - Company(2018)
- PA_UNEMP_COMPANY_2018
+ ER: US-PA Unemployment
+ ER_US_PA_UNEMP
python
- result = (payslip.date_to[:4] == '2018')
+ result = (contract.futa_type != contract.FUTA_TYPE_BASIC)
code
-result_rate = -contract.pa_unemp_company_rate(2018)
-result = categories.PA_UNEMP_WAGES
+rate = payslip.dict.get_rate('ER_US_PA_UNEMP')
+result_rate = -rate.rate
+result = categories.WAGE_ER_US_PA_UNEMP
# result_rate of 0 implies 100% due to bug
if result_rate == 0.0:
@@ -67,15 +71,34 @@ if result_rate == 0.0:
- Pennsylvania Income Withholding
- PA_INC_WITHHOLD_2018
+ EE: US-PA Income Withholding
+ EE_US_PA_INC_WITHHOLD
python
- result = (payslip.date_to[:4] == '2018')
+ result = True
code
+rate = payslip.dict.get_rate('US_PA_INC_WITHHOLD')
wages = categories.GROSS
-income_tax_rate = contract.pa_withhold_rate(2018) / -100.0
-result = wages * income_tax_rate
+result_rate = -rate.rate
+result = wages
+
+# result_rate of 0 implies 100% due to bug
+if result_rate == 0.0:
+ result = 0.0
+
+
+
+
+
+
+
+ EE: US-PA Income Withholding Additional
+ EE_US_PA_INC_WITHHOLD_ADD
+ python
+ result = (contract.pa_additional_withholding)
+ code
+
+result = -contract.pa_additional_withholding
diff --git a/l10n_us_pa_hr_payroll/hr_payroll.py b/l10n_us_pa_hr_payroll/hr_payroll.py
deleted file mode 100755
index 33f5ea06..00000000
--- a/l10n_us_pa_hr_payroll/hr_payroll.py
+++ /dev/null
@@ -1,49 +0,0 @@
-from odoo import models, fields, api
-
-
-class USPAHrContract(models.Model):
- _inherit = 'hr.contract'
-
- pa_additional_withholding = fields.Integer(string="Additional Withholding",
- default=0)
-
- @api.multi
- def pa_unemp_company_rate(self, year):
- self.ensure_one()
- if self.futa_type == self.FUTA_TYPE_BASIC:
- return 0.0
-
- if hasattr(self.employee_id.company_id, 'pa_unemp_company_rate_' + str(year)):
- return self.employee_id.company_id['pa_unemp_company_rate_' + str(year)]
-
- raise NotImplemented('Year (' + str(year) + ') Not implemented for US Pennsylvania')
-
- def pa_unemp_employee_rate(self, year):
- self.ensure_one()
- if self.futa_type == self.FUTA_TYPE_BASIC:
- return 0.0
-
- if hasattr(self.employee_id.company_id, 'pa_unemp_employee_rate_' + str(year)):
- return self.employee_id.company_id['pa_unemp_employee_rate_' + str(year)]
-
- raise NotImplemented('Year (' + str(year) + ') Not implemented for US Pennsylvania')
-
- def pa_withhold_rate(self, year):
- self.ensure_one()
- if self.futa_type == self.FUTA_TYPE_BASIC:
- return 0.0
-
- if hasattr(self.employee_id.company_id, 'pa_withhold_rate_' + str(year)):
- return self.employee_id.company_id['pa_withhold_rate_' + str(year)]
-
- raise NotImplemented('Year (' + str(year) + ') Not implemented for US Pennsylvania')
-
-
-class PACompany(models.Model):
- _inherit = 'res.company'
-
- # Company Unemployment rate is default rate for new employers.
- pa_unemp_company_rate_2018 = fields.Float(string="Pennsylvania Unemployment Rate 2018", default=3.6890)
- pa_unemp_employee_rate_2018 = fields.Float(string="Pennsylvania Unemployment Rate 2018", default=0.06)
- pa_withhold_rate_2018 = fields.Float(string="Pennsylvania Income Tax Rate 2018", default=3.07)
-
diff --git a/l10n_us_pa_hr_payroll/models/__init__.py b/l10n_us_pa_hr_payroll/models/__init__.py
new file mode 100644
index 00000000..e99aa24a
--- /dev/null
+++ b/l10n_us_pa_hr_payroll/models/__init__.py
@@ -0,0 +1 @@
+from . import hr_payroll
diff --git a/l10n_us_pa_hr_payroll/models/hr_payroll.py b/l10n_us_pa_hr_payroll/models/hr_payroll.py
new file mode 100755
index 00000000..a2c36df1
--- /dev/null
+++ b/l10n_us_pa_hr_payroll/models/hr_payroll.py
@@ -0,0 +1,7 @@
+from odoo import models, fields, api
+
+
+class USPAHrContract(models.Model):
+ _inherit = 'hr.contract'
+
+ pa_additional_withholding = fields.Float(string="Additional Withholding")
diff --git a/l10n_us_pa_hr_payroll/tests/__init__.py b/l10n_us_pa_hr_payroll/tests/__init__.py
index e6301d7f..6bf37afe 100755
--- a/l10n_us_pa_hr_payroll/tests/__init__.py
+++ b/l10n_us_pa_hr_payroll/tests/__init__.py
@@ -1 +1,2 @@
from . import test_us_pa_payslip_2018
+from . import test_us_pa_payslip_2019
diff --git a/l10n_us_pa_hr_payroll/tests/test_us_pa_payslip_2018.py b/l10n_us_pa_hr_payroll/tests/test_us_pa_payslip_2018.py
index f6717bfe..a3ade9bd 100755
--- a/l10n_us_pa_hr_payroll/tests/test_us_pa_payslip_2018.py
+++ b/l10n_us_pa_hr_payroll/tests/test_us_pa_payslip_2018.py
@@ -1,5 +1,4 @@
from odoo.addons.l10n_us_hr_payroll.tests.test_us_payslip import TestUsPayslip, process_payslip
-from odoo.addons.l10n_us_hr_payroll.models.l10n_us_hr_payroll import USHrContract
class TestUsPAPayslip(TestUsPayslip):
@@ -7,24 +6,17 @@ class TestUsPAPayslip(TestUsPayslip):
# Taxes and Rates
###
PA_UNEMP_MAX_WAGE = 10000.0
+ ER_PA_UNEMP = -3.6890 / 100.0
+ EE_PA_UNEMP = -0.06 / 100.0
+ PA_INC_WITHHOLD = 3.07
def test_2018_taxes(self):
- self.debug = True
salary = 4166.67
wh = -127.92
employee = self._createEmployee()
- employee.company_id.pa_unemp_employee_rate_2018 = 0.06
- employee.company_id.pa_unemp_company_rate_2018 = 3.6785
- employee.company_id.pa_withhold_rate_2018 = 3.07
-
contract = self._createContract(employee, salary, struct_id=self.ref('l10n_us_pa_hr_payroll.hr_payroll_salary_structure_us_pa_employee'))
- # tax rates
- pa_unemp_employee = contract.pa_unemp_employee_rate(2018) / -100.0
- pa_unemp_company = contract.pa_unemp_company_rate(2018) / -100.0
-
-
self._log('2018 Pennsylvania tax first payslip:')
payslip = self._createPayslip(employee, '2018-01-01', '2018-01-31')
payslip.onchange_contract()
@@ -32,8 +24,7 @@ class TestUsPAPayslip(TestUsPayslip):
cats = self._getCategories(payslip)
- self.assertPayrollEqual(cats['PA_UNEMP_WAGES'], salary)
- self.assertPayrollEqual(cats['PA_UNEMP_EMPLOYEE'], cats['PA_UNEMP_WAGES'] * pa_unemp_employee)
- self.assertPayrollEqual(cats['PA_UNEMP_COMPANY'], cats['PA_UNEMP_WAGES'] * pa_unemp_company)
- self.assertPayrollEqual(cats['PA_WITHHOLD'], wh)
-
+ self.assertPayrollEqual(cats['WAGE_ER_US_PA_UNEMP'], salary)
+ self.assertPayrollEqual(cats['EE_US_PA_UNEMP'], cats['BASIC'] * self.EE_PA_UNEMP)
+ self.assertPayrollEqual(cats['ER_US_PA_UNEMP'], cats['WAGE_ER_US_PA_UNEMP'] * self.ER_PA_UNEMP)
+ self.assertPayrollEqual(cats['EE_US_PA_INC_WITHHOLD'], wh)
diff --git a/l10n_us_pa_hr_payroll/tests/test_us_pa_payslip_2019.py b/l10n_us_pa_hr_payroll/tests/test_us_pa_payslip_2019.py
new file mode 100755
index 00000000..df13a93e
--- /dev/null
+++ b/l10n_us_pa_hr_payroll/tests/test_us_pa_payslip_2019.py
@@ -0,0 +1,33 @@
+from odoo.addons.l10n_us_hr_payroll.tests.test_us_payslip import TestUsPayslip, process_payslip
+
+
+class TestUsPAPayslip(TestUsPayslip):
+ ###
+ # Taxes and Rates
+ ###
+ PA_UNEMP_MAX_WAGE = 10000.0
+ ER_PA_UNEMP = -3.6890 / 100.0
+ EE_PA_UNEMP = -0.06 / 100.0
+ PA_INC_WITHHOLD = 3.07
+
+ def test_2019_taxes(self):
+ salary = 4166.67
+ additional_withhold = 5.0
+ wh = -127.92 - additional_withhold
+
+
+ employee = self._createEmployee()
+ contract = self._createContract(employee, salary, struct_id=self.ref('l10n_us_pa_hr_payroll.hr_payroll_salary_structure_us_pa_employee'))
+ contract.pa_additional_withholding = additional_withhold
+
+ self._log('2019 Pennsylvania tax first payslip:')
+ payslip = self._createPayslip(employee, '2019-01-01', '2019-01-31')
+ payslip.onchange_contract()
+ payslip.compute_sheet()
+
+ cats = self._getCategories(payslip)
+
+ self.assertPayrollEqual(cats['WAGE_ER_US_PA_UNEMP'], salary)
+ self.assertPayrollEqual(cats['EE_US_PA_UNEMP'], cats['BASIC'] * self.EE_PA_UNEMP)
+ self.assertPayrollEqual(cats['ER_US_PA_UNEMP'], cats['WAGE_ER_US_PA_UNEMP'] * self.ER_PA_UNEMP)
+ self.assertPayrollEqual(cats['EE_US_PA_INC_WITHHOLD'], wh)
diff --git a/l10n_us_pa_hr_payroll/hr_payroll_view.xml b/l10n_us_pa_hr_payroll/views/hr_payroll_views.xml
similarity index 52%
rename from l10n_us_pa_hr_payroll/hr_payroll_view.xml
rename to l10n_us_pa_hr_payroll/views/hr_payroll_views.xml
index f6d22c94..08b44a88 100755
--- a/l10n_us_pa_hr_payroll/hr_payroll_view.xml
+++ b/l10n_us_pa_hr_payroll/views/hr_payroll_views.xml
@@ -1,21 +1,6 @@
-
- res.company.form
- res.company
- 64
-
-
-
-
-
-
-
-
-
-
-
hr.contract.form.inherit
hr.contract