From 90eae4873c0f72f907172c2a328dee88e9aa49a6 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Mon, 30 Apr 2018 14:32:01 -0700 Subject: [PATCH 1/5] Initial commit of `l10n_us_wa_hr_payroll` for 11.0 --- l10n_us_wa_hr_payroll/README.rst | 20 +++++ l10n_us_wa_hr_payroll/__init__.py | 1 + l10n_us_wa_hr_payroll/__manifest__.py | 28 ++++++ l10n_us_wa_hr_payroll/data/base.xml | 88 +++++++++++++++++++ l10n_us_wa_hr_payroll/data/final.xml | 20 +++++ l10n_us_wa_hr_payroll/data/rules_2018.xml | 49 +++++++++++ l10n_us_wa_hr_payroll/hr_payroll.py | 33 +++++++ l10n_us_wa_hr_payroll/hr_payroll_view.xml | 31 +++++++ .../security/ir.model.access.csv | 3 + l10n_us_wa_hr_payroll/tests/__init__.py | 1 + .../tests/test_us_wa_payslip_2018.py | 61 +++++++++++++ 11 files changed, 335 insertions(+) create mode 100644 l10n_us_wa_hr_payroll/README.rst create mode 100644 l10n_us_wa_hr_payroll/__init__.py create mode 100755 l10n_us_wa_hr_payroll/__manifest__.py create mode 100755 l10n_us_wa_hr_payroll/data/base.xml create mode 100755 l10n_us_wa_hr_payroll/data/final.xml create mode 100755 l10n_us_wa_hr_payroll/data/rules_2018.xml create mode 100755 l10n_us_wa_hr_payroll/hr_payroll.py create mode 100755 l10n_us_wa_hr_payroll/hr_payroll_view.xml create mode 100644 l10n_us_wa_hr_payroll/security/ir.model.access.csv create mode 100755 l10n_us_wa_hr_payroll/tests/__init__.py create mode 100755 l10n_us_wa_hr_payroll/tests/test_us_wa_payslip_2018.py diff --git a/l10n_us_wa_hr_payroll/README.rst b/l10n_us_wa_hr_payroll/README.rst new file mode 100644 index 00000000..1b6fb32e --- /dev/null +++ b/l10n_us_wa_hr_payroll/README.rst @@ -0,0 +1,20 @@ +************************************* +Hibou - US Payroll - Washington State +************************************* + +Calculations and contribution registers for Washington State Payroll. + +For more information and add-ons, visit `Hibou.io `_. + +============= +Main Features +============= + +* LNI (Labor and Industries) defined on HR Contracts that can be shared between contracts. +* Company level State Unemployment Rate (SUTA) + +======= +License +======= +Please see `LICENSE `_. +Copyright Hibou Corp. 2018 diff --git a/l10n_us_wa_hr_payroll/__init__.py b/l10n_us_wa_hr_payroll/__init__.py new file mode 100644 index 00000000..e99aa24a --- /dev/null +++ b/l10n_us_wa_hr_payroll/__init__.py @@ -0,0 +1 @@ +from . import hr_payroll diff --git a/l10n_us_wa_hr_payroll/__manifest__.py b/l10n_us_wa_hr_payroll/__manifest__.py new file mode 100755 index 00000000..efad9188 --- /dev/null +++ b/l10n_us_wa_hr_payroll/__manifest__.py @@ -0,0 +1,28 @@ +{ + 'name': 'USA - Washington - Payroll', + 'author': 'Hibou Corp. ', + 'license': 'AGPL-3', + 'category': 'Localization', + 'depends': ['l10n_us_hr_payroll'], + 'version': '11.0.2018.0.0', + 'description': """ +USA::Washington Payroll Rules. +============================== + +* Contribution register and partner for Washington Employment Security Department - Unemployment +* Contribution register and partner for Washington Labor & Industries - (LNI) +* Contract level LNI +* Company level Washington Unemployment Rate + """, + + 'auto_install': False, + 'website': 'https://hibou.io/', + 'data': [ + 'security/ir.model.access.csv', + 'hr_payroll_view.xml', + 'data/base.xml', + 'data/rules_2018.xml', + 'data/final.xml', + ], + 'installable': True +} diff --git a/l10n_us_wa_hr_payroll/data/base.xml b/l10n_us_wa_hr_payroll/data/base.xml new file mode 100755 index 00000000..3aea7bed --- /dev/null +++ b/l10n_us_wa_hr_payroll/data/base.xml @@ -0,0 +1,88 @@ + + + + + + Washington Employment Security Department - Unemployment Tax + 1 + + + + Washington Labor & Industries - LNI + 1 + + + + Washington Employment + Washington Employment Security Department - Unemployment + + + + Washington Labor & Industries + Washington Labor & Industries - LNI + + + + + + + Washington Unemployment - Wages + WA_UNEMP_WAGES + + + + Washington Unemployment + WA_UNEMP + + + + + Washington LNI + WA_LNI + + + + + Washington LNI Withholding + WA_LNI_WITHHOLD + + + + + + + + Washington LNI Withholding + WA_LNI_WITHHOLD + none + code + +hours = worked_days.WORK100.number_of_hours +rate = contract.wa_lni.rate_emp_withhold +if rate: + result = -(hours * rate) + + + + + + + + Washington LNI + WA_LNI + + none + code + +hours = worked_days.WORK100.number_of_hours +rate = contract.wa_lni.rate +withholding = categories.WA_LNI_WITHHOLD +if rate: + result = -(hours * rate) - withholding + + + + + + + diff --git a/l10n_us_wa_hr_payroll/data/final.xml b/l10n_us_wa_hr_payroll/data/final.xml new file mode 100755 index 00000000..b1655d4c --- /dev/null +++ b/l10n_us_wa_hr_payroll/data/final.xml @@ -0,0 +1,20 @@ + + + + + + + US_WA_EMP + USA Washington Employee + + + + + + + diff --git a/l10n_us_wa_hr_payroll/data/rules_2018.xml b/l10n_us_wa_hr_payroll/data/rules_2018.xml new file mode 100755 index 00000000..a8271265 --- /dev/null +++ b/l10n_us_wa_hr_payroll/data/rules_2018.xml @@ -0,0 +1,49 @@ + + + + + + + + + Washington Unemployment - Wages (2018) + WA_UNEMP_WAGES_2018 + python + result = (payslip.date_to[:4] == '2018') + code + +### +ytd = payslip.sum('WA_UNEMP_WAGES_2018', '2018-01-01', '2019-01-01') +ytd += contract.external_wages +remaining = 47300.0 - ytd +if remaining <= 0.0: + result = 0 +elif remaining < categories.GROSS: + result = remaining +else: + result = categories.GROSS + + + + + + + Washington Unemployment (2018) + WA_UNEMP_2018 + python + result = (payslip.date_to[:4] == '2018') + code + +result_rate = -contract.wa_unemp_rate(2018) +result = categories.WA_UNEMP_WAGES + +# result_rate of 0 implies 100% due to bug +if result_rate == 0.0: + result = 0.0 + + + + + + + diff --git a/l10n_us_wa_hr_payroll/hr_payroll.py b/l10n_us_wa_hr_payroll/hr_payroll.py new file mode 100755 index 00000000..6e45dbc8 --- /dev/null +++ b/l10n_us_wa_hr_payroll/hr_payroll.py @@ -0,0 +1,33 @@ +from odoo import models, fields, api + + +class USWAHrContract(models.Model): + _inherit = 'hr.contract' + + wa_lni = fields.Many2one('hr.contract.lni.wa', string='WA State LNI') + + @api.multi + def wa_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, 'wa_unemp_rate_' + str(year)): + return self.employee_id.company_id['wa_unemp_rate_' + str(year)] + + raise NotImplemented('Year (' + str(year) + ') Not implemented for US Washington.') + + +class WACompany(models.Model): + _inherit = 'res.company' + + # No Defaults, need to sign up with the Employment Security Department + wa_unemp_rate_2018 = fields.Float(string="Washington Unemployment Rate 2018", default=0.0) + + +class WALNI(models.Model): + _name = 'hr.contract.lni.wa' + + name = fields.Char(string='Name') + rate = fields.Float(string='Rate (per hour worked)', digits=(7, 6)) + rate_emp_withhold = fields.Float(string='Employee Payroll Deduction Rate (per hour worked)', digits=(7, 6)) diff --git a/l10n_us_wa_hr_payroll/hr_payroll_view.xml b/l10n_us_wa_hr_payroll/hr_payroll_view.xml new file mode 100755 index 00000000..519391bc --- /dev/null +++ b/l10n_us_wa_hr_payroll/hr_payroll_view.xml @@ -0,0 +1,31 @@ + + + + + res.company.form + res.company + 64 + + + + + + + + + + + hr.contract.form.inherit + hr.contract + 64 + + + + + + + + + + + diff --git a/l10n_us_wa_hr_payroll/security/ir.model.access.csv b/l10n_us_wa_hr_payroll/security/ir.model.access.csv new file mode 100644 index 00000000..ac216dd2 --- /dev/null +++ b/l10n_us_wa_hr_payroll/security/ir.model.access.csv @@ -0,0 +1,3 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_hr_contract_lni_wa,access_hr_contract_lni_wa,model_hr_contract_lni_wa,base.group_user,1,0,0,0 +manage_hr_contract_lni_wa,manage_hr_contract_lni_wa,model_hr_contract_lni_wa,hr_payroll.group_hr_payroll_manager,1,1,1,1 \ No newline at end of file diff --git a/l10n_us_wa_hr_payroll/tests/__init__.py b/l10n_us_wa_hr_payroll/tests/__init__.py new file mode 100755 index 00000000..c6d19c7c --- /dev/null +++ b/l10n_us_wa_hr_payroll/tests/__init__.py @@ -0,0 +1 @@ +from . import test_us_wa_payslip_2018 diff --git a/l10n_us_wa_hr_payroll/tests/test_us_wa_payslip_2018.py b/l10n_us_wa_hr_payroll/tests/test_us_wa_payslip_2018.py new file mode 100755 index 00000000..54631587 --- /dev/null +++ b/l10n_us_wa_hr_payroll/tests/test_us_wa_payslip_2018.py @@ -0,0 +1,61 @@ +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 TestUsWAPayslip(TestUsPayslip): + ### + # Taxes and Rates + ### + WA_UNEMP_MAX_WAGE = 47300.0 + + def setUp(self): + super(TestUsWAPayslip, self).setUp() + self.lni = self.env['hr.contract.lni.wa'].create({ + 'name': '5302 Computer Consulting', + 'rate': 0.1261, + 'rate_emp_withhold': 0.05575, + }) + + def test_2018_taxes(self): + salary = 25000.0 + + employee = self._createEmployee() + employee.company_id.wa_unemp_rate_2018 = 1.16 + + contract = self._createContract(employee, salary, struct_id=self.ref('l10n_us_wa_hr_payroll.hr_payroll_salary_structure_us_wa_employee')) + self._log(str(contract.resource_calendar_id) + ' ' + contract.resource_calendar_id.name) + contract.wa_lni = self.lni + + # tax rates + wa_unemp = contract.wa_unemp_rate(2018) / -100.0 + + self._log('2018 Washington tax first payslip:') + payslip = self._createPayslip(employee, '2018-01-01', '2018-01-31') + payslip.onchange_contract() + hours_in_period = payslip.worked_days_line_ids.filtered(lambda l: l.code == 'WORK100').number_of_hours + payslip.compute_sheet() + + + cats = self._getCategories(payslip) + + self.assertPayrollEqual(cats['WA_UNEMP_WAGES'], salary) + self.assertPayrollEqual(cats['WA_UNEMP'], cats['WA_UNEMP_WAGES'] * wa_unemp) + self.assertPayrollEqual(cats['WA_LNI_WITHHOLD'], -(self.lni.rate_emp_withhold * hours_in_period)) + self.assertPayrollEqual(cats['WA_LNI'], -(self.lni.rate * hours_in_period) - cats['WA_LNI_WITHHOLD']) + + process_payslip(payslip) + + # Make a new payslip, this one will have maximums + + remaining_wa_unemp_wages = self.WA_UNEMP_MAX_WAGE - salary if (self.WA_UNEMP_MAX_WAGE - 2*salary < salary) \ + else salary + + self._log('2018 Washington tax second payslip:') + payslip = self._createPayslip(employee, '2018-02-01', '2018-02-28') + payslip.onchange_contract() + payslip.compute_sheet() + + cats = self._getCategories(payslip) + + self.assertPayrollEqual(cats['WA_UNEMP_WAGES'], remaining_wa_unemp_wages) + self.assertPayrollEqual(cats['WA_UNEMP'], remaining_wa_unemp_wages * wa_unemp) From dd2c5432d145cce4f04aae5fef3a6b0b3cad9f8f Mon Sep 17 00:00:00 2001 From: Kristen Marie Kulha Date: Thu, 3 May 2018 15:24:28 -0700 Subject: [PATCH 2/5] Improved US Payroll form views --- l10n_us_wa_hr_payroll/hr_payroll_view.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/l10n_us_wa_hr_payroll/hr_payroll_view.xml b/l10n_us_wa_hr_payroll/hr_payroll_view.xml index 519391bc..3f502872 100755 --- a/l10n_us_wa_hr_payroll/hr_payroll_view.xml +++ b/l10n_us_wa_hr_payroll/hr_payroll_view.xml @@ -17,12 +17,14 @@ hr.contract.form.inherit hr.contract - 64 + 148 - - + + + + From 6d2976f93b660a58357396042ffa63efd708079f Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Sun, 9 Dec 2018 11:51:01 -0800 Subject: [PATCH 3/5] 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_wa_hr_payroll/data/rules_2018.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/l10n_us_wa_hr_payroll/data/rules_2018.xml b/l10n_us_wa_hr_payroll/data/rules_2018.xml index a8271265..cf77a274 100755 --- a/l10n_us_wa_hr_payroll/data/rules_2018.xml +++ b/l10n_us_wa_hr_payroll/data/rules_2018.xml @@ -18,10 +18,10 @@ ytd += contract.external_wages remaining = 47300.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 bc1f62f523d2b2825fff27cb0b09cac7a0e6fa7f Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Sun, 6 Jan 2019 17:06:37 -0800 Subject: [PATCH 4/5] Update `l10n_us_hr_payroll` for 2019 Federal Rates and Limits. --- l10n_us_wa_hr_payroll/tests/test_us_wa_payslip_2018.py | 1 - 1 file changed, 1 deletion(-) diff --git a/l10n_us_wa_hr_payroll/tests/test_us_wa_payslip_2018.py b/l10n_us_wa_hr_payroll/tests/test_us_wa_payslip_2018.py index 54631587..63090be9 100755 --- a/l10n_us_wa_hr_payroll/tests/test_us_wa_payslip_2018.py +++ b/l10n_us_wa_hr_payroll/tests/test_us_wa_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.l10n_us_hr_payroll import USHrContract class TestUsWAPayslip(TestUsPayslip): From 7b41b6c26430361d4a29a262d7c938db5425a06e Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Mon, 28 Oct 2019 17:36:09 -0700 Subject: [PATCH 5/5] MIG `l10n_us_wa_hr_payroll` Migrate to 12.0 and Payroll 2019 standards --- l10n_us_wa_hr_payroll/__init__.py | 2 +- l10n_us_wa_hr_payroll/__manifest__.py | 7 +- l10n_us_wa_hr_payroll/data/base.xml | 52 ++--------- l10n_us_wa_hr_payroll/data/rates.xml | 19 ++++ l10n_us_wa_hr_payroll/data/rules.xml | 87 +++++++++++++++++++ l10n_us_wa_hr_payroll/data/rules_2018.xml | 49 ----------- l10n_us_wa_hr_payroll/hr_payroll.py | 33 ------- l10n_us_wa_hr_payroll/models/__init__.py | 1 + l10n_us_wa_hr_payroll/models/hr_payroll.py | 15 ++++ l10n_us_wa_hr_payroll/tests/__init__.py | 1 + .../tests/test_us_wa_payslip_2018.py | 16 ++-- .../tests/test_us_wa_payslip_2019.py | 60 +++++++++++++ .../hr_payroll_views.xml} | 13 --- 13 files changed, 204 insertions(+), 151 deletions(-) create mode 100644 l10n_us_wa_hr_payroll/data/rates.xml create mode 100755 l10n_us_wa_hr_payroll/data/rules.xml delete mode 100755 l10n_us_wa_hr_payroll/data/rules_2018.xml delete mode 100755 l10n_us_wa_hr_payroll/hr_payroll.py create mode 100644 l10n_us_wa_hr_payroll/models/__init__.py create mode 100755 l10n_us_wa_hr_payroll/models/hr_payroll.py create mode 100755 l10n_us_wa_hr_payroll/tests/test_us_wa_payslip_2019.py rename l10n_us_wa_hr_payroll/{hr_payroll_view.xml => views/hr_payroll_views.xml} (57%) diff --git a/l10n_us_wa_hr_payroll/__init__.py b/l10n_us_wa_hr_payroll/__init__.py index e99aa24a..0650744f 100644 --- a/l10n_us_wa_hr_payroll/__init__.py +++ b/l10n_us_wa_hr_payroll/__init__.py @@ -1 +1 @@ -from . import hr_payroll +from . import models diff --git a/l10n_us_wa_hr_payroll/__manifest__.py b/l10n_us_wa_hr_payroll/__manifest__.py index efad9188..2fc72921 100755 --- a/l10n_us_wa_hr_payroll/__manifest__.py +++ b/l10n_us_wa_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': '12.0.2019.0.0', 'description': """ USA::Washington Payroll Rules. ============================== @@ -19,9 +19,10 @@ USA::Washington Payroll Rules. 'website': 'https://hibou.io/', 'data': [ 'security/ir.model.access.csv', - '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_wa_hr_payroll/data/base.xml b/l10n_us_wa_hr_payroll/data/base.xml index 3aea7bed..20ce5d4e 100755 --- a/l10n_us_wa_hr_payroll/data/base.xml +++ b/l10n_us_wa_hr_payroll/data/base.xml @@ -26,63 +26,27 @@ - Washington Unemployment - Wages - WA_UNEMP_WAGES + Wage: US-WA Unemployment + WAGE_US_WA_UNEMP - Washington Unemployment - WA_UNEMP + ER: US-WA Unemployment + ER_US_WA_UNEMP - Washington LNI - WA_LNI + ER: US-WA LNI + ER_US_WA_LNI - Washington LNI Withholding - WA_LNI_WITHHOLD + EE: US-WA LNI + EE_US_WA_LNI - - - - - Washington LNI Withholding - WA_LNI_WITHHOLD - none - code - -hours = worked_days.WORK100.number_of_hours -rate = contract.wa_lni.rate_emp_withhold -if rate: - result = -(hours * rate) - - - - - - - - Washington LNI - WA_LNI - - none - code - -hours = worked_days.WORK100.number_of_hours -rate = contract.wa_lni.rate -withholding = categories.WA_LNI_WITHHOLD -if rate: - result = -(hours * rate) - withholding - - - - - diff --git a/l10n_us_wa_hr_payroll/data/rates.xml b/l10n_us_wa_hr_payroll/data/rates.xml new file mode 100644 index 00000000..0278f36a --- /dev/null +++ b/l10n_us_wa_hr_payroll/data/rates.xml @@ -0,0 +1,19 @@ + + + + + US Washington Unemployment + US_WA_UNEMP + 1.16 + 2018-01-01 + + + + US Washington Unemployment + US_WA_UNEMP + 1.03 + 2019-01-01 + + + + \ No newline at end of file diff --git a/l10n_us_wa_hr_payroll/data/rules.xml b/l10n_us_wa_hr_payroll/data/rules.xml new file mode 100755 index 00000000..cfe87748 --- /dev/null +++ b/l10n_us_wa_hr_payroll/data/rules.xml @@ -0,0 +1,87 @@ + + + + + + + + Wage: US-WA Unemployment + WAGE_US_WA_UNEMP + python + result = (contract.futa_type != contract.FUTA_TYPE_BASIC) + code + +### +year = payslip.dict.date_to.year +rate = payslip.dict.get_rate('US_WA_UNEMP') +ytd = payslip.sum('WAGE_US_WA_UNEMP', str(year) + '-01-01', str(year+1) + '-01-01') +ytd += contract.external_wages +remaining = rate.wage_limit_year - ytd +if remaining <= 0.0: + result = 0 +elif remaining < categories.BASIC: + result = remaining +else: + result = categories.BASIC + + + + + + + + ER: US-WA Unemployment + ER_US_WA_UNEMP + python + result = (contract.futa_type != contract.FUTA_TYPE_BASIC) + code + +rate = payslip.dict.get_rate('US_WA_UNEMP') +result_rate = -rate.rate +result = categories.WAGE_US_WA_UNEMP + +# result_rate of 0 implies 100% due to bug +if result_rate == 0.0: + result = 0.0 + + + + + + + + + EE: US-WA LNI + EE_US_WA_LNI + none + code + +hours = worked_days.WORK100.number_of_hours +rate = contract.wa_lni.rate_emp_withhold +if rate: + result = -(hours * rate) + + + + + + + + + ER: US-WA LNI + ER_US_WA_LNI + + none + code + +hours = worked_days.WORK100.number_of_hours +rate = contract.wa_lni.rate +withholding = categories.EE_US_WA_LNI +if rate: + result = -(hours * rate) - withholding + + + + + + diff --git a/l10n_us_wa_hr_payroll/data/rules_2018.xml b/l10n_us_wa_hr_payroll/data/rules_2018.xml deleted file mode 100755 index cf77a274..00000000 --- a/l10n_us_wa_hr_payroll/data/rules_2018.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - Washington Unemployment - Wages (2018) - WA_UNEMP_WAGES_2018 - python - result = (payslip.date_to[:4] == '2018') - code - -### -ytd = payslip.sum('WA_UNEMP_WAGES_2018', '2018-01-01', '2019-01-01') -ytd += contract.external_wages -remaining = 47300.0 - ytd -if remaining <= 0.0: - result = 0 -elif remaining < categories.BASIC: - result = remaining -else: - result = categories.BASIC - - - - - - - Washington Unemployment (2018) - WA_UNEMP_2018 - python - result = (payslip.date_to[:4] == '2018') - code - -result_rate = -contract.wa_unemp_rate(2018) -result = categories.WA_UNEMP_WAGES - -# result_rate of 0 implies 100% due to bug -if result_rate == 0.0: - result = 0.0 - - - - - - - diff --git a/l10n_us_wa_hr_payroll/hr_payroll.py b/l10n_us_wa_hr_payroll/hr_payroll.py deleted file mode 100755 index 6e45dbc8..00000000 --- a/l10n_us_wa_hr_payroll/hr_payroll.py +++ /dev/null @@ -1,33 +0,0 @@ -from odoo import models, fields, api - - -class USWAHrContract(models.Model): - _inherit = 'hr.contract' - - wa_lni = fields.Many2one('hr.contract.lni.wa', string='WA State LNI') - - @api.multi - def wa_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, 'wa_unemp_rate_' + str(year)): - return self.employee_id.company_id['wa_unemp_rate_' + str(year)] - - raise NotImplemented('Year (' + str(year) + ') Not implemented for US Washington.') - - -class WACompany(models.Model): - _inherit = 'res.company' - - # No Defaults, need to sign up with the Employment Security Department - wa_unemp_rate_2018 = fields.Float(string="Washington Unemployment Rate 2018", default=0.0) - - -class WALNI(models.Model): - _name = 'hr.contract.lni.wa' - - name = fields.Char(string='Name') - rate = fields.Float(string='Rate (per hour worked)', digits=(7, 6)) - rate_emp_withhold = fields.Float(string='Employee Payroll Deduction Rate (per hour worked)', digits=(7, 6)) diff --git a/l10n_us_wa_hr_payroll/models/__init__.py b/l10n_us_wa_hr_payroll/models/__init__.py new file mode 100644 index 00000000..e99aa24a --- /dev/null +++ b/l10n_us_wa_hr_payroll/models/__init__.py @@ -0,0 +1 @@ +from . import hr_payroll diff --git a/l10n_us_wa_hr_payroll/models/hr_payroll.py b/l10n_us_wa_hr_payroll/models/hr_payroll.py new file mode 100755 index 00000000..6b5c023a --- /dev/null +++ b/l10n_us_wa_hr_payroll/models/hr_payroll.py @@ -0,0 +1,15 @@ +from odoo import models, fields, api + + +class USWAHrContract(models.Model): + _inherit = 'hr.contract' + + wa_lni = fields.Many2one('hr.contract.lni.wa', string='WA State LNI') + + +class WALNI(models.Model): + _name = 'hr.contract.lni.wa' + + name = fields.Char(string='Name') + rate = fields.Float(string='Rate (per hour worked)', digits=(7, 6)) + rate_emp_withhold = fields.Float(string='Employee Payroll Deduction Rate (per hour worked)', digits=(7, 6)) diff --git a/l10n_us_wa_hr_payroll/tests/__init__.py b/l10n_us_wa_hr_payroll/tests/__init__.py index c6d19c7c..be35a060 100755 --- a/l10n_us_wa_hr_payroll/tests/__init__.py +++ b/l10n_us_wa_hr_payroll/tests/__init__.py @@ -1 +1,2 @@ from . import test_us_wa_payslip_2018 +from . import test_us_wa_payslip_2019 diff --git a/l10n_us_wa_hr_payroll/tests/test_us_wa_payslip_2018.py b/l10n_us_wa_hr_payroll/tests/test_us_wa_payslip_2018.py index 63090be9..9482b460 100755 --- a/l10n_us_wa_hr_payroll/tests/test_us_wa_payslip_2018.py +++ b/l10n_us_wa_hr_payroll/tests/test_us_wa_payslip_2018.py @@ -6,6 +6,7 @@ class TestUsWAPayslip(TestUsPayslip): # Taxes and Rates ### WA_UNEMP_MAX_WAGE = 47300.0 + WA_UNEMP_RATE = 1.16 def setUp(self): super(TestUsWAPayslip, self).setUp() @@ -19,14 +20,13 @@ class TestUsWAPayslip(TestUsPayslip): salary = 25000.0 employee = self._createEmployee() - employee.company_id.wa_unemp_rate_2018 = 1.16 contract = self._createContract(employee, salary, struct_id=self.ref('l10n_us_wa_hr_payroll.hr_payroll_salary_structure_us_wa_employee')) self._log(str(contract.resource_calendar_id) + ' ' + contract.resource_calendar_id.name) contract.wa_lni = self.lni # tax rates - wa_unemp = contract.wa_unemp_rate(2018) / -100.0 + wa_unemp = self.WA_UNEMP_RATE / -100.0 self._log('2018 Washington tax first payslip:') payslip = self._createPayslip(employee, '2018-01-01', '2018-01-31') @@ -37,10 +37,10 @@ class TestUsWAPayslip(TestUsPayslip): cats = self._getCategories(payslip) - self.assertPayrollEqual(cats['WA_UNEMP_WAGES'], salary) - self.assertPayrollEqual(cats['WA_UNEMP'], cats['WA_UNEMP_WAGES'] * wa_unemp) - self.assertPayrollEqual(cats['WA_LNI_WITHHOLD'], -(self.lni.rate_emp_withhold * hours_in_period)) - self.assertPayrollEqual(cats['WA_LNI'], -(self.lni.rate * hours_in_period) - cats['WA_LNI_WITHHOLD']) + self.assertPayrollEqual(cats['WAGE_US_WA_UNEMP'], salary) + self.assertPayrollEqual(cats['ER_US_WA_UNEMP'], cats['WAGE_US_WA_UNEMP'] * wa_unemp) + self.assertPayrollEqual(cats['EE_US_WA_LNI'], -(self.lni.rate_emp_withhold * hours_in_period)) + self.assertPayrollEqual(cats['ER_US_WA_LNI'], -(self.lni.rate * hours_in_period) - cats['EE_US_WA_LNI']) process_payslip(payslip) @@ -56,5 +56,5 @@ class TestUsWAPayslip(TestUsPayslip): cats = self._getCategories(payslip) - self.assertPayrollEqual(cats['WA_UNEMP_WAGES'], remaining_wa_unemp_wages) - self.assertPayrollEqual(cats['WA_UNEMP'], remaining_wa_unemp_wages * wa_unemp) + self.assertPayrollEqual(cats['WAGE_US_WA_UNEMP'], remaining_wa_unemp_wages) + self.assertPayrollEqual(cats['ER_US_WA_UNEMP'], remaining_wa_unemp_wages * wa_unemp) diff --git a/l10n_us_wa_hr_payroll/tests/test_us_wa_payslip_2019.py b/l10n_us_wa_hr_payroll/tests/test_us_wa_payslip_2019.py new file mode 100755 index 00000000..72c0fc75 --- /dev/null +++ b/l10n_us_wa_hr_payroll/tests/test_us_wa_payslip_2019.py @@ -0,0 +1,60 @@ +from odoo.addons.l10n_us_hr_payroll.tests.test_us_payslip import TestUsPayslip, process_payslip + + +class TestUsWAPayslip(TestUsPayslip): + ### + # Taxes and Rates + ### + WA_UNEMP_MAX_WAGE = 49800.0 + WA_UNEMP_RATE = 1.03 + + def setUp(self): + super(TestUsWAPayslip, self).setUp() + self.lni = self.env['hr.contract.lni.wa'].create({ + 'name': '5302 Computer Consulting', + 'rate': 0.1261, + 'rate_emp_withhold': 0.05575, + }) + + def test_2019_taxes(self): + salary = 25000.0 + + employee = self._createEmployee() + + contract = self._createContract(employee, salary, struct_id=self.ref('l10n_us_wa_hr_payroll.hr_payroll_salary_structure_us_wa_employee')) + self._log(str(contract.resource_calendar_id) + ' ' + contract.resource_calendar_id.name) + contract.wa_lni = self.lni + + # tax rates + wa_unemp = self.WA_UNEMP_RATE / -100.0 + + self._log('2019 Washington tax first payslip:') + payslip = self._createPayslip(employee, '2019-01-01', '2019-01-31') + payslip.onchange_contract() + hours_in_period = payslip.worked_days_line_ids.filtered(lambda l: l.code == 'WORK100').number_of_hours + payslip.compute_sheet() + + + cats = self._getCategories(payslip) + + self.assertPayrollEqual(cats['WAGE_US_WA_UNEMP'], salary) + self.assertPayrollEqual(cats['ER_US_WA_UNEMP'], cats['WAGE_US_WA_UNEMP'] * wa_unemp) + self.assertPayrollEqual(cats['EE_US_WA_LNI'], -(self.lni.rate_emp_withhold * hours_in_period)) + self.assertPayrollEqual(cats['ER_US_WA_LNI'], -(self.lni.rate * hours_in_period) - cats['EE_US_WA_LNI']) + + process_payslip(payslip) + + # Make a new payslip, this one will have maximums + + remaining_wa_unemp_wages = self.WA_UNEMP_MAX_WAGE - salary if (self.WA_UNEMP_MAX_WAGE - 2*salary < salary) \ + else salary + + self._log('2019 Washington tax second payslip:') + payslip = self._createPayslip(employee, '2019-02-01', '2019-02-28') + payslip.onchange_contract() + payslip.compute_sheet() + + cats = self._getCategories(payslip) + + self.assertPayrollEqual(cats['WAGE_US_WA_UNEMP'], remaining_wa_unemp_wages) + self.assertPayrollEqual(cats['ER_US_WA_UNEMP'], remaining_wa_unemp_wages * wa_unemp) diff --git a/l10n_us_wa_hr_payroll/hr_payroll_view.xml b/l10n_us_wa_hr_payroll/views/hr_payroll_views.xml similarity index 57% rename from l10n_us_wa_hr_payroll/hr_payroll_view.xml rename to l10n_us_wa_hr_payroll/views/hr_payroll_views.xml index 3f502872..abd56634 100755 --- a/l10n_us_wa_hr_payroll/hr_payroll_view.xml +++ b/l10n_us_wa_hr_payroll/views/hr_payroll_views.xml @@ -1,19 +1,6 @@ - - res.company.form - res.company - 64 - - - - - - - - - hr.contract.form.inherit hr.contract