From 9817a4af39748a614c46f54e02b50f5761ba861b Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Mon, 30 Apr 2018 08:15:31 -0700 Subject: [PATCH 1/7] 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_fl_hr_payroll/__init__.py | 3 + l10n_us_fl_hr_payroll/__manifest__.py | 29 +++++ l10n_us_fl_hr_payroll/data/base.xml | 31 ++++++ l10n_us_fl_hr_payroll/data/final.xml | 24 ++++ l10n_us_fl_hr_payroll/data/rules_2016.xml | 49 +++++++++ l10n_us_fl_hr_payroll/data/rules_2017.xml | 49 +++++++++ l10n_us_fl_hr_payroll/data/rules_2018.xml | 49 +++++++++ l10n_us_fl_hr_payroll/tests/__init__.py | 5 + .../tests/test_us_fl_payslip_2016.py | 104 ++++++++++++++++++ .../tests/test_us_fl_payslip_2017.py | 97 ++++++++++++++++ .../tests/test_us_fl_payslip_2018.py | 97 ++++++++++++++++ l10n_us_fl_hr_payroll/us_fl_hr_payroll.py | 25 +++++ .../us_fl_hr_payroll_view.xml | 20 ++++ 13 files changed, 582 insertions(+) create mode 100755 l10n_us_fl_hr_payroll/__init__.py create mode 100755 l10n_us_fl_hr_payroll/__manifest__.py create mode 100755 l10n_us_fl_hr_payroll/data/base.xml create mode 100755 l10n_us_fl_hr_payroll/data/final.xml create mode 100755 l10n_us_fl_hr_payroll/data/rules_2016.xml create mode 100755 l10n_us_fl_hr_payroll/data/rules_2017.xml create mode 100755 l10n_us_fl_hr_payroll/data/rules_2018.xml create mode 100755 l10n_us_fl_hr_payroll/tests/__init__.py create mode 100755 l10n_us_fl_hr_payroll/tests/test_us_fl_payslip_2016.py create mode 100755 l10n_us_fl_hr_payroll/tests/test_us_fl_payslip_2017.py create mode 100755 l10n_us_fl_hr_payroll/tests/test_us_fl_payslip_2018.py create mode 100755 l10n_us_fl_hr_payroll/us_fl_hr_payroll.py create mode 100755 l10n_us_fl_hr_payroll/us_fl_hr_payroll_view.xml diff --git a/l10n_us_fl_hr_payroll/__init__.py b/l10n_us_fl_hr_payroll/__init__.py new file mode 100755 index 00000000..94a3a6e2 --- /dev/null +++ b/l10n_us_fl_hr_payroll/__init__.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- + +from . import us_fl_hr_payroll \ No newline at end of file diff --git a/l10n_us_fl_hr_payroll/__manifest__.py b/l10n_us_fl_hr_payroll/__manifest__.py new file mode 100755 index 00000000..171f9ef2 --- /dev/null +++ b/l10n_us_fl_hr_payroll/__manifest__.py @@ -0,0 +1,29 @@ +# -*- encoding: utf-8 -*- +{ + 'name': 'USA - Florida - Payroll', + 'author': 'Hibou Corp. ', + 'license': 'AGPL-3', + 'category': 'Localization', + 'depends': ['l10n_us_hr_payroll'], + 'version': '11.0.2017.0.0', + 'description': """ +USA::Florida Payroll Rules. +=========================== + + * Florida Department of Revenue partner + * Contribution register for Florida DoR + * Company level Florida Unemployment Rate + """, + + 'auto_install': False, + 'website': 'https://hibou.io/', + 'data':[ + 'us_fl_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_fl_hr_payroll/data/base.xml b/l10n_us_fl_hr_payroll/data/base.xml new file mode 100755 index 00000000..c4803456 --- /dev/null +++ b/l10n_us_fl_hr_payroll/data/base.xml @@ -0,0 +1,31 @@ + + + + + + + Florida Department of Revenue + 1 + + + + Florida Unemployment + Florida Department of Revenue - Unemployment + + + + + + + Florida Unemployment - Wages + FL_UNEMP_WAGES + + + + Florida Unemployment + FL_UNEMP + + + + + diff --git a/l10n_us_fl_hr_payroll/data/final.xml b/l10n_us_fl_hr_payroll/data/final.xml new file mode 100755 index 00000000..59081992 --- /dev/null +++ b/l10n_us_fl_hr_payroll/data/final.xml @@ -0,0 +1,24 @@ + + + + + + + US_FL_EMP + USA Florida Employee + + + + + + + diff --git a/l10n_us_fl_hr_payroll/data/rules_2016.xml b/l10n_us_fl_hr_payroll/data/rules_2016.xml new file mode 100755 index 00000000..8a9fcce0 --- /dev/null +++ b/l10n_us_fl_hr_payroll/data/rules_2016.xml @@ -0,0 +1,49 @@ + + + + + + + + + Florida Unemployment - Wages (2016) + FL_UNEMP_WAGES_2016 + python + result = (payslip.date_to[:4] == '2016') + code + +### +ytd = payslip.sum('FL_UNEMP_WAGES_2016', '2016-01-01', '2017-01-01') +ytd += contract.external_wages +remaining = 7000.0 - ytd +if remaining <= 0.0: + result = 0 +elif remaining < categories.GROSS: + result = remaining +else: + result = categories.GROSS + + + + + + + Florida Unemployment (2016) + FL_UNEMP_2016 + python + result = (payslip.date_to[:4] == '2016') + code + +result_rate = -contract.fl_unemp_rate(2016) +result = categories.FL_UNEMP_WAGES + +# result_rate of 0 implies 100% due to bug +if result_rate == 0.0: + result = 0.0 + + + + + + + diff --git a/l10n_us_fl_hr_payroll/data/rules_2017.xml b/l10n_us_fl_hr_payroll/data/rules_2017.xml new file mode 100755 index 00000000..1fea1ba3 --- /dev/null +++ b/l10n_us_fl_hr_payroll/data/rules_2017.xml @@ -0,0 +1,49 @@ + + + + + + + + + Florida Unemployment - Wages (2017) + FL_UNEMP_WAGES_2017 + python + result = (payslip.date_to[:4] == '2017') + code + +### +ytd = payslip.sum('FL_UNEMP_WAGES_2017', '2017-01-01', '2018-01-01') +ytd += contract.external_wages +remaining = 7000.0 - ytd +if remaining <= 0.0: + result = 0 +elif remaining < categories.GROSS: + result = remaining +else: + result = categories.GROSS + + + + + + + Florida Unemployment (2017) + FL_UNEMP_2017 + python + result = (payslip.date_to[:4] == '2017') + code + +result_rate = -contract.fl_unemp_rate(2017) +result = categories.FL_UNEMP_WAGES + +# result_rate of 0 implies 100% due to bug +if result_rate == 0.0: + result = 0.0 + + + + + + + diff --git a/l10n_us_fl_hr_payroll/data/rules_2018.xml b/l10n_us_fl_hr_payroll/data/rules_2018.xml new file mode 100755 index 00000000..7adabdbe --- /dev/null +++ b/l10n_us_fl_hr_payroll/data/rules_2018.xml @@ -0,0 +1,49 @@ + + + + + + + + + Florida Unemployment - Wages (2018) + FL_UNEMP_WAGES_2018 + python + result = (payslip.date_to[:4] == '2018') + code + +### +ytd = payslip.sum('FL_UNEMP_WAGES_2018', '2018-01-01', '2019-01-01') +ytd += contract.external_wages +remaining = 7000.0 - ytd +if remaining <= 0.0: + result = 0 +elif remaining < categories.GROSS: + result = remaining +else: + result = categories.GROSS + + + + + + + Florida Unemployment (2018) + FL_UNEMP_2018 + python + result = (payslip.date_to[:4] == '2018') + code + +result_rate = -contract.fl_unemp_rate(2018) +result = categories.FL_UNEMP_WAGES + +# result_rate of 0 implies 100% due to bug +if result_rate == 0.0: + result = 0.0 + + + + + + + diff --git a/l10n_us_fl_hr_payroll/tests/__init__.py b/l10n_us_fl_hr_payroll/tests/__init__.py new file mode 100755 index 00000000..e6fc00b9 --- /dev/null +++ b/l10n_us_fl_hr_payroll/tests/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- + +from . import test_us_fl_payslip_2016 +from . import test_us_fl_payslip_2017 +from . import test_us_fl_payslip_2018 diff --git a/l10n_us_fl_hr_payroll/tests/test_us_fl_payslip_2016.py b/l10n_us_fl_hr_payroll/tests/test_us_fl_payslip_2016.py new file mode 100755 index 00000000..09cf4b55 --- /dev/null +++ b/l10n_us_fl_hr_payroll/tests/test_us_fl_payslip_2016.py @@ -0,0 +1,104 @@ +# -*- 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 TestUsFlPayslip(TestUsPayslip): + ### + # 2016 Taxes and Rates + ### + + def test_2016_taxes(self): + salary = 5000.0; + + ## tax maximums + FL_UNEMP_MAX_WAGE = 7000.0 + + + employee = self._createEmployee() + employee.company_id.fl_unemp_rate_2016 = 2.7 + + contract = self._createContract(employee, salary, struct_id=self.ref('l10n_us_fl_hr_payroll.hr_payroll_salary_structure_us_fl_employee')) + + ## tax rates + FL_UNEMP = contract.fl_unemp_rate(2016) / -100.0 + + self._log('2016 Florida tax first payslip:') + payslip = self._createPayslip(employee, '2016-01-01', '2016-01-31') + + payslip.compute_sheet() + + cats = self._getCategories(payslip) + + self.assertPayrollEqual(cats['FL_UNEMP_WAGES'], salary) + self.assertPayrollEqual(cats['FL_UNEMP'], cats['FL_UNEMP_WAGES'] * FL_UNEMP) + + process_payslip(payslip) + + # Make a new payslip, this one will have maximums + + remaining_fl_unemp_wages = FL_UNEMP_MAX_WAGE - salary if (FL_UNEMP_MAX_WAGE - 2*salary < salary) else salary + + self._log('2016 Florida 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['FL_UNEMP_WAGES'], remaining_fl_unemp_wages) + self.assertPayrollEqual(cats['FL_UNEMP'], remaining_fl_unemp_wages * FL_UNEMP) + + + def test_2016_taxes_with_external(self): + salary = 5000.0; + external_wages = 6000.0 + + employee = self._createEmployee() + employee.company_id.fl_unemp_rate_2016 = 2.7 + + contract = self._createContract(employee, salary, external_wages=external_wages, struct_id=self.ref('l10n_us_fl_hr_payroll.hr_payroll_salary_structure_us_fl_employee')) + ## tax maximums + FL_UNEMP_MAX_WAGE = 7000.0 + + ## tax rates + FL_UNEMP = contract.fl_unemp_rate(2016) / -100.0 + + self._log('2016 Forida_external tax first payslip:') + payslip = self._createPayslip(employee, '2016-01-01', '2016-01-31') + + payslip.compute_sheet() + + cats = self._getCategories(payslip) + + self.assertPayrollEqual(cats['FL_UNEMP_WAGES'], FL_UNEMP_MAX_WAGE - external_wages) + self.assertPayrollEqual(cats['FL_UNEMP'], cats['FL_UNEMP_WAGES'] * FL_UNEMP) + + + def test_2016_taxes_with_state_exempt(self): + salary = 5000.0; + external_wages = 6000.0 + + employee = self._createEmployee() + employee.company_id.fl_unemp_rate_2016 = 2.7 + + contract = self._createContract(employee, salary, external_wages=external_wages, struct_id=self.ref( + 'l10n_us_fl_hr_payroll.hr_payroll_salary_structure_us_fl_employee'), futa_type=USHrContract.FUTA_TYPE_BASIC) + ## tax maximums + FL_UNEMP_MAX_WAGE = 7000.0 + + ## tax rates + FL_UNEMP = contract.fl_unemp_rate(2016) / -100.0 + + self.assertPayrollEqual(FL_UNEMP, 0.0) + + self._log('2016 Forida_external tax first payslip:') + payslip = self._createPayslip(employee, '2016-01-01', '2016-01-31') + + payslip.compute_sheet() + + cats = self._getCategories(payslip) + + self.assertPayrollEqual(cats['FL_UNEMP_WAGES'], FL_UNEMP_MAX_WAGE - external_wages) + self.assertPayrollEqual(cats['FL_UNEMP'], cats['FL_UNEMP_WAGES'] * FL_UNEMP) \ No newline at end of file diff --git a/l10n_us_fl_hr_payroll/tests/test_us_fl_payslip_2017.py b/l10n_us_fl_hr_payroll/tests/test_us_fl_payslip_2017.py new file mode 100755 index 00000000..7d53c79c --- /dev/null +++ b/l10n_us_fl_hr_payroll/tests/test_us_fl_payslip_2017.py @@ -0,0 +1,97 @@ +# -*- 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 TestUsFlPayslip(TestUsPayslip): + ### + # 2017 Taxes and Rates + ### + FL_UNEMP_MAX_WAGE = 7000.0 + + def test_2017_taxes(self): + salary = 5000.0 + + employee = self._createEmployee() + employee.company_id.fl_unemp_rate_2017 = 2.7 + + contract = self._createContract(employee, salary, struct_id=self.ref('l10n_us_fl_hr_payroll.hr_payroll_salary_structure_us_fl_employee')) + + # tax rates + fl_unemp = contract.fl_unemp_rate(2017) / -100.0 + + self._log('2017 Florida tax first payslip:') + payslip = self._createPayslip(employee, '2017-01-01', '2017-01-31') + + payslip.compute_sheet() + + cats = self._getCategories(payslip) + + self.assertPayrollEqual(cats['FL_UNEMP_WAGES'], salary) + self.assertPayrollEqual(cats['FL_UNEMP'], cats['FL_UNEMP_WAGES'] * fl_unemp) + + process_payslip(payslip) + + # Make a new payslip, this one will have maximums + + remaining_fl_unemp_wages = self.FL_UNEMP_MAX_WAGE - salary if (self.FL_UNEMP_MAX_WAGE - 2*salary < salary) \ + else salary + + self._log('2017 Florida tax second payslip:') + payslip = self._createPayslip(employee, '2017-02-01', '2017-02-28') + + payslip.compute_sheet() + + cats = self._getCategories(payslip) + + self.assertPayrollEqual(cats['FL_UNEMP_WAGES'], remaining_fl_unemp_wages) + self.assertPayrollEqual(cats['FL_UNEMP'], remaining_fl_unemp_wages * fl_unemp) + + def test_2017_taxes_with_external(self): + salary = 5000.0 + external_wages = 6000.0 + + employee = self._createEmployee() + employee.company_id.fl_unemp_rate_2017 = 2.7 + + contract = self._createContract(employee, salary, external_wages=external_wages, + struct_id=self.ref('l10n_us_fl_hr_payroll.hr_payroll_salary_structure_us_fl_employee')) + + # tax rates + fl_unemp = contract.fl_unemp_rate(2017) / -100.0 + + self._log('2017 Forida_external tax first payslip:') + payslip = self._createPayslip(employee, '2017-01-01', '2017-01-31') + + payslip.compute_sheet() + + cats = self._getCategories(payslip) + + self.assertPayrollEqual(cats['FL_UNEMP_WAGES'], self.FL_UNEMP_MAX_WAGE - external_wages) + self.assertPayrollEqual(cats['FL_UNEMP'], cats['FL_UNEMP_WAGES'] * fl_unemp) + + def test_2017_taxes_with_state_exempt(self): + salary = 5000.0 + external_wages = 6000.0 + + employee = self._createEmployee() + employee.company_id.fl_unemp_rate_2017 = 2.7 + + contract = self._createContract(employee, salary, external_wages=external_wages, struct_id=self.ref( + 'l10n_us_fl_hr_payroll.hr_payroll_salary_structure_us_fl_employee'), futa_type=USHrContract.FUTA_TYPE_BASIC) + + # tax rates + fl_unemp = contract.fl_unemp_rate(2017) / -100.0 + + self.assertPayrollEqual(fl_unemp, 0.0) + + self._log('2017 Forida_external tax first payslip:') + payslip = self._createPayslip(employee, '2017-01-01', '2017-01-31') + + payslip.compute_sheet() + + cats = self._getCategories(payslip) + + self.assertPayrollEqual(cats['FL_UNEMP_WAGES'], self.FL_UNEMP_MAX_WAGE - external_wages) + self.assertPayrollEqual(cats['FL_UNEMP'], cats['FL_UNEMP_WAGES'] * fl_unemp) diff --git a/l10n_us_fl_hr_payroll/tests/test_us_fl_payslip_2018.py b/l10n_us_fl_hr_payroll/tests/test_us_fl_payslip_2018.py new file mode 100755 index 00000000..5c4a25ab --- /dev/null +++ b/l10n_us_fl_hr_payroll/tests/test_us_fl_payslip_2018.py @@ -0,0 +1,97 @@ +# -*- 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 TestUsFlPayslip(TestUsPayslip): + ### + # 2018 Taxes and Rates + ### + FL_UNEMP_MAX_WAGE = 7000.0 + + def test_2018_taxes(self): + salary = 5000.0 + + employee = self._createEmployee() + employee.company_id.fl_unemp_rate_2018 = 2.7 + + contract = self._createContract(employee, salary, struct_id=self.ref('l10n_us_fl_hr_payroll.hr_payroll_salary_structure_us_fl_employee')) + + # tax rates + fl_unemp = contract.fl_unemp_rate(2018) / -100.0 + + self._log('2018 Florida tax first payslip:') + payslip = self._createPayslip(employee, '2018-01-01', '2018-01-31') + + payslip.compute_sheet() + + cats = self._getCategories(payslip) + + self.assertPayrollEqual(cats['FL_UNEMP_WAGES'], salary) + self.assertPayrollEqual(cats['FL_UNEMP'], cats['FL_UNEMP_WAGES'] * fl_unemp) + + process_payslip(payslip) + + # Make a new payslip, this one will have maximums + + remaining_fl_unemp_wages = self.FL_UNEMP_MAX_WAGE - salary if (self.FL_UNEMP_MAX_WAGE - 2*salary < salary) \ + else salary + + self._log('2018 Florida tax second payslip:') + payslip = self._createPayslip(employee, '2018-02-01', '2018-02-28') + + payslip.compute_sheet() + + cats = self._getCategories(payslip) + + self.assertPayrollEqual(cats['FL_UNEMP_WAGES'], remaining_fl_unemp_wages) + self.assertPayrollEqual(cats['FL_UNEMP'], remaining_fl_unemp_wages * fl_unemp) + + def test_2018_taxes_with_external(self): + salary = 5000.0 + external_wages = 6000.0 + + employee = self._createEmployee() + employee.company_id.fl_unemp_rate_2018 = 2.7 + + contract = self._createContract(employee, salary, external_wages=external_wages, + struct_id=self.ref('l10n_us_fl_hr_payroll.hr_payroll_salary_structure_us_fl_employee')) + + # tax rates + fl_unemp = contract.fl_unemp_rate(2018) / -100.0 + + self._log('2018 Forida_external tax first payslip:') + payslip = self._createPayslip(employee, '2018-01-01', '2018-01-31') + + payslip.compute_sheet() + + cats = self._getCategories(payslip) + + self.assertPayrollEqual(cats['FL_UNEMP_WAGES'], self.FL_UNEMP_MAX_WAGE - external_wages) + self.assertPayrollEqual(cats['FL_UNEMP'], cats['FL_UNEMP_WAGES'] * fl_unemp) + + def test_2018_taxes_with_state_exempt(self): + salary = 5000.0 + external_wages = 6000.0 + + employee = self._createEmployee() + employee.company_id.fl_unemp_rate_2018 = 2.7 + + contract = self._createContract(employee, salary, external_wages=external_wages, struct_id=self.ref( + 'l10n_us_fl_hr_payroll.hr_payroll_salary_structure_us_fl_employee'), futa_type=USHrContract.FUTA_TYPE_BASIC) + + # tax rates + fl_unemp = contract.fl_unemp_rate(2018) / -100.0 + + self.assertPayrollEqual(fl_unemp, 0.0) + + self._log('2018 Forida_external tax first payslip:') + payslip = self._createPayslip(employee, '2018-01-01', '2018-01-31') + + payslip.compute_sheet() + + cats = self._getCategories(payslip) + + self.assertPayrollEqual(cats['FL_UNEMP_WAGES'], self.FL_UNEMP_MAX_WAGE - external_wages) + self.assertPayrollEqual(cats['FL_UNEMP'], cats['FL_UNEMP_WAGES'] * fl_unemp) diff --git a/l10n_us_fl_hr_payroll/us_fl_hr_payroll.py b/l10n_us_fl_hr_payroll/us_fl_hr_payroll.py new file mode 100755 index 00000000..2d6ea1f9 --- /dev/null +++ b/l10n_us_fl_hr_payroll/us_fl_hr_payroll.py @@ -0,0 +1,25 @@ +from odoo import models, fields, api + + +class USFLHrContract(models.Model): + _inherit = 'hr.contract' + + @api.multi + def fl_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, 'fl_unemp_rate_' + str(year)): + return self.employee_id.company_id['fl_unemp_rate_' + str(year)] + + raise NotImplemented('Year (' + str(year) + ') Not implemented for US Florida.') + + +class FLCompany(models.Model): + _inherit = 'res.company' + + # Defaults from :: http://floridarevenue.com/dor/taxes/reemployment.html + fl_unemp_rate_2016 = fields.Float(string="Florida Unemployment Rate 2016", default=2.7) + fl_unemp_rate_2017 = fields.Float(string="Florida Unemployment Rate 2017", default=2.7) + fl_unemp_rate_2018 = fields.Float(string="Florida Unemployment Rate 2018", default=2.7) diff --git a/l10n_us_fl_hr_payroll/us_fl_hr_payroll_view.xml b/l10n_us_fl_hr_payroll/us_fl_hr_payroll_view.xml new file mode 100755 index 00000000..aa19a733 --- /dev/null +++ b/l10n_us_fl_hr_payroll/us_fl_hr_payroll_view.xml @@ -0,0 +1,20 @@ + + + + + res.company.form + res.company + 20 + + + + + + + + + + + + + From aac9348b7c9705dc370e9d3731a6af1f404325b5 Mon Sep 17 00:00:00 2001 From: Kristen Marie Kulha Date: Thu, 3 May 2018 15:24:28 -0700 Subject: [PATCH 2/7] Improved US Payroll form views --- l10n_us_fl_hr_payroll/us_fl_hr_payroll_view.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/l10n_us_fl_hr_payroll/us_fl_hr_payroll_view.xml b/l10n_us_fl_hr_payroll/us_fl_hr_payroll_view.xml index aa19a733..458f4b84 100755 --- a/l10n_us_fl_hr_payroll/us_fl_hr_payroll_view.xml +++ b/l10n_us_fl_hr_payroll/us_fl_hr_payroll_view.xml @@ -16,5 +16,20 @@ + + hr.contract.form.inherit + hr.contract + 110 + + + + + +

No additional fields.

+ + + + + From b6defad9f6a4326c5dce8fd57b70733bcef1f127 Mon Sep 17 00:00:00 2001 From: Kristen Marie Kulha Date: Fri, 15 Jun 2018 11:22:49 -0700 Subject: [PATCH 3/7] Add README to `l10n_us_fl_hr_payroll` --- l10n_us_fl_hr_payroll/README.rst | 37 ++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 l10n_us_fl_hr_payroll/README.rst diff --git a/l10n_us_fl_hr_payroll/README.rst b/l10n_us_fl_hr_payroll/README.rst new file mode 100644 index 00000000..3ba372bc --- /dev/null +++ b/l10n_us_fl_hr_payroll/README.rst @@ -0,0 +1,37 @@ +********************************** +Hibou - US Payroll - Florida State +********************************** + +Calculations and contribution registers for Florida State Payroll. + +For more information and add-ons, visit `Hibou.io `_. + +============= +Main Features +============= + +* New Partner and Contribution Register for Florida Department of Revenue +* Company level Florida Unemployment Rate + +.. image:: https://user-images.githubusercontent.com/15882954/41440232-a2ca8cb0-6fe2-11e8-9640-0bfd61ae6108.png + :alt: 'Employee Contract Detail' + :width: 988 + :align: left + +USA Florida Employee Added to Contract Salary Structure Menu + +.. image:: https://user-images.githubusercontent.com/15882954/41440247-b7b42744-6fe2-11e8-8ffb-d259eb893646.png + :alt: 'Computed Pay Slip Detail' + :width: 988 + :align: left + +New Payslip Categories for: + +* Florida Unemployment +* Florida Unemployment - Wages + +======= +License +======= +Please see `LICENSE `_. +Copyright Hibou Corp. 2018 From 1a3781f5b9ee6b8a95d68f7239533756e36ebe6c Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Sun, 9 Dec 2018 11:51:01 -0800 Subject: [PATCH 4/7] 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_fl_hr_payroll/data/rules_2018.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/l10n_us_fl_hr_payroll/data/rules_2018.xml b/l10n_us_fl_hr_payroll/data/rules_2018.xml index 7adabdbe..9fdc56da 100755 --- a/l10n_us_fl_hr_payroll/data/rules_2018.xml +++ b/l10n_us_fl_hr_payroll/data/rules_2018.xml @@ -18,10 +18,10 @@ ytd += contract.external_wages remaining = 7000.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 b0bbdaaeef94b7d81b7388ea34f62ba4fcd621aa Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Sun, 6 Jan 2019 17:06:37 -0800 Subject: [PATCH 5/7] Update `l10n_us_hr_payroll` for 2019 Federal Rates and Limits. --- l10n_us_fl_hr_payroll/tests/test_us_fl_payslip_2016.py | 2 +- l10n_us_fl_hr_payroll/tests/test_us_fl_payslip_2017.py | 2 +- l10n_us_fl_hr_payroll/tests/test_us_fl_payslip_2018.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/l10n_us_fl_hr_payroll/tests/test_us_fl_payslip_2016.py b/l10n_us_fl_hr_payroll/tests/test_us_fl_payslip_2016.py index 09cf4b55..45ad7797 100755 --- a/l10n_us_fl_hr_payroll/tests/test_us_fl_payslip_2016.py +++ b/l10n_us_fl_hr_payroll/tests/test_us_fl_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 TestUsFlPayslip(TestUsPayslip): diff --git a/l10n_us_fl_hr_payroll/tests/test_us_fl_payslip_2017.py b/l10n_us_fl_hr_payroll/tests/test_us_fl_payslip_2017.py index 7d53c79c..c96d0a9b 100755 --- a/l10n_us_fl_hr_payroll/tests/test_us_fl_payslip_2017.py +++ b/l10n_us_fl_hr_payroll/tests/test_us_fl_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 TestUsFlPayslip(TestUsPayslip): diff --git a/l10n_us_fl_hr_payroll/tests/test_us_fl_payslip_2018.py b/l10n_us_fl_hr_payroll/tests/test_us_fl_payslip_2018.py index 5c4a25ab..070581ec 100755 --- a/l10n_us_fl_hr_payroll/tests/test_us_fl_payslip_2018.py +++ b/l10n_us_fl_hr_payroll/tests/test_us_fl_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 TestUsFlPayslip(TestUsPayslip): From cb78bc54f85bb5712501e62e2704ddae247d2835 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Wed, 16 Jan 2019 10:10:18 -0800 Subject: [PATCH 6/7] Update `l10n_us_fl_hr_payroll` for 2019 Rates and Limits No changes from 2018 other than refactor. --- l10n_us_fl_hr_payroll/README.rst | 26 +++++ l10n_us_fl_hr_payroll/__init__.py | 3 - l10n_us_fl_hr_payroll/__manifest__.py | 9 +- l10n_us_fl_hr_payroll/data/base.xml | 8 +- l10n_us_fl_hr_payroll/data/final.xml | 6 - l10n_us_fl_hr_payroll/data/rates.xml | 19 ++++ .../data/{rules_2018.xml => rules.xml} | 23 ++-- l10n_us_fl_hr_payroll/data/rules_2016.xml | 49 --------- l10n_us_fl_hr_payroll/data/rules_2017.xml | 49 --------- l10n_us_fl_hr_payroll/tests/__init__.py | 5 +- .../tests/test_us_fl_payslip_2016.py | 104 ------------------ .../tests/test_us_fl_payslip_2017.py | 97 ---------------- .../tests/test_us_fl_payslip_2018.py | 36 ++---- .../tests/test_us_fl_payslip_2019.py | 79 +++++++++++++ l10n_us_fl_hr_payroll/us_fl_hr_payroll.py | 25 ----- .../us_fl_hr_payroll_views.xml} | 15 --- 16 files changed, 155 insertions(+), 398 deletions(-) create mode 100644 l10n_us_fl_hr_payroll/data/rates.xml rename l10n_us_fl_hr_payroll/data/{rules_2018.xml => rules.xml} (63%) delete mode 100755 l10n_us_fl_hr_payroll/data/rules_2016.xml delete mode 100755 l10n_us_fl_hr_payroll/data/rules_2017.xml delete mode 100755 l10n_us_fl_hr_payroll/tests/test_us_fl_payslip_2016.py delete mode 100755 l10n_us_fl_hr_payroll/tests/test_us_fl_payslip_2017.py create mode 100755 l10n_us_fl_hr_payroll/tests/test_us_fl_payslip_2019.py delete mode 100755 l10n_us_fl_hr_payroll/us_fl_hr_payroll.py rename l10n_us_fl_hr_payroll/{us_fl_hr_payroll_view.xml => views/us_fl_hr_payroll_views.xml} (52%) diff --git a/l10n_us_fl_hr_payroll/README.rst b/l10n_us_fl_hr_payroll/README.rst index 3ba372bc..05d9ebe9 100644 --- a/l10n_us_fl_hr_payroll/README.rst +++ b/l10n_us_fl_hr_payroll/README.rst @@ -30,6 +30,32 @@ New Payslip Categories for: * Florida Unemployment * Florida Unemployment - Wages +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_fl_hr_payroll.hr_payroll_rules_fl_unemp_wages_2018', + 'l10n_us_fl_hr_payroll.hr_payroll_rules_fl_unemp_2018', + ] + for rule_id in rules: + migrate_rule_name(rule_id) + + env.cr.commit() + + + ======= License ======= diff --git a/l10n_us_fl_hr_payroll/__init__.py b/l10n_us_fl_hr_payroll/__init__.py index 94a3a6e2..e69de29b 100755 --- a/l10n_us_fl_hr_payroll/__init__.py +++ b/l10n_us_fl_hr_payroll/__init__.py @@ -1,3 +0,0 @@ -# -*- coding: utf-8 -*- - -from . import us_fl_hr_payroll \ No newline at end of file diff --git a/l10n_us_fl_hr_payroll/__manifest__.py b/l10n_us_fl_hr_payroll/__manifest__.py index 171f9ef2..8f88ee3c 100755 --- a/l10n_us_fl_hr_payroll/__manifest__.py +++ b/l10n_us_fl_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::Florida Payroll Rules. =========================== @@ -18,11 +18,10 @@ USA::Florida Payroll Rules. 'auto_install': False, 'website': 'https://hibou.io/', 'data':[ - 'us_fl_hr_payroll_view.xml', + 'views/us_fl_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_fl_hr_payroll/data/base.xml b/l10n_us_fl_hr_payroll/data/base.xml index c4803456..ef430e4c 100755 --- a/l10n_us_fl_hr_payroll/data/base.xml +++ b/l10n_us_fl_hr_payroll/data/base.xml @@ -17,13 +17,13 @@ - Florida Unemployment - Wages - FL_UNEMP_WAGES + Wage: US-FL Unemployment + WAGE_US_FL_UNEMP - Florida Unemployment - FL_UNEMP + ER: US-FL Unemployment + ER_US_FL_UNEMP diff --git a/l10n_us_fl_hr_payroll/data/final.xml b/l10n_us_fl_hr_payroll/data/final.xml index 59081992..54fd0979 100755 --- a/l10n_us_fl_hr_payroll/data/final.xml +++ b/l10n_us_fl_hr_payroll/data/final.xml @@ -7,12 +7,6 @@ US_FL_EMP USA Florida Employee diff --git a/l10n_us_fl_hr_payroll/data/rates.xml b/l10n_us_fl_hr_payroll/data/rates.xml new file mode 100644 index 00000000..38856abd --- /dev/null +++ b/l10n_us_fl_hr_payroll/data/rates.xml @@ -0,0 +1,19 @@ + + + + + US Florida Unemployment + US_FL_UNEMP + 2.7 + 2018-01-01 + + + + US Florida Unemployment + US_FL_UNEMP + 2.7 + 2019-01-01 + + + + \ No newline at end of file diff --git a/l10n_us_fl_hr_payroll/data/rules_2018.xml b/l10n_us_fl_hr_payroll/data/rules.xml similarity index 63% rename from l10n_us_fl_hr_payroll/data/rules_2018.xml rename to l10n_us_fl_hr_payroll/data/rules.xml index 9fdc56da..d8606400 100755 --- a/l10n_us_fl_hr_payroll/data/rules_2018.xml +++ b/l10n_us_fl_hr_payroll/data/rules.xml @@ -6,16 +6,18 @@ - Florida Unemployment - Wages (2018) - FL_UNEMP_WAGES_2018 + Wage: US-FL Unemployment + WAGE_US_FL_UNEMP python - result = (payslip.date_to[:4] == '2018') + result = (contract.futa_type != contract.FUTA_TYPE_BASIC) code ### -ytd = payslip.sum('FL_UNEMP_WAGES_2018', '2018-01-01', '2019-01-01') +year = int(payslip.dict.date_to[:4]) +rate = payslip.dict.get_rate('US_FL_UNEMP') +ytd = payslip.sum('WAGE_US_FL_UNEMP', str(year) + '-01-01', str(year+1) + '-01-01') ytd += contract.external_wages -remaining = 7000.0 - ytd +remaining = rate.wage_limit_year - ytd if remaining <= 0.0: result = 0 elif remaining < categories.BASIC: @@ -28,14 +30,15 @@ else: - Florida Unemployment (2018) - FL_UNEMP_2018 + ER: US-FL Unemployment + ER_US_FL_UNEMP python - result = (payslip.date_to[:4] == '2018') + result = (contract.futa_type != contract.FUTA_TYPE_BASIC) code -result_rate = -contract.fl_unemp_rate(2018) -result = categories.FL_UNEMP_WAGES +rate = payslip.dict.get_rate('US_FL_UNEMP') +result_rate = -rate.rate +result = categories.WAGE_US_FL_UNEMP # result_rate of 0 implies 100% due to bug if result_rate == 0.0: diff --git a/l10n_us_fl_hr_payroll/data/rules_2016.xml b/l10n_us_fl_hr_payroll/data/rules_2016.xml deleted file mode 100755 index 8a9fcce0..00000000 --- a/l10n_us_fl_hr_payroll/data/rules_2016.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - Florida Unemployment - Wages (2016) - FL_UNEMP_WAGES_2016 - python - result = (payslip.date_to[:4] == '2016') - code - -### -ytd = payslip.sum('FL_UNEMP_WAGES_2016', '2016-01-01', '2017-01-01') -ytd += contract.external_wages -remaining = 7000.0 - ytd -if remaining <= 0.0: - result = 0 -elif remaining < categories.GROSS: - result = remaining -else: - result = categories.GROSS - - - - - - - Florida Unemployment (2016) - FL_UNEMP_2016 - python - result = (payslip.date_to[:4] == '2016') - code - -result_rate = -contract.fl_unemp_rate(2016) -result = categories.FL_UNEMP_WAGES - -# result_rate of 0 implies 100% due to bug -if result_rate == 0.0: - result = 0.0 - - - - - - - diff --git a/l10n_us_fl_hr_payroll/data/rules_2017.xml b/l10n_us_fl_hr_payroll/data/rules_2017.xml deleted file mode 100755 index 1fea1ba3..00000000 --- a/l10n_us_fl_hr_payroll/data/rules_2017.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - Florida Unemployment - Wages (2017) - FL_UNEMP_WAGES_2017 - python - result = (payslip.date_to[:4] == '2017') - code - -### -ytd = payslip.sum('FL_UNEMP_WAGES_2017', '2017-01-01', '2018-01-01') -ytd += contract.external_wages -remaining = 7000.0 - ytd -if remaining <= 0.0: - result = 0 -elif remaining < categories.GROSS: - result = remaining -else: - result = categories.GROSS - - - - - - - Florida Unemployment (2017) - FL_UNEMP_2017 - python - result = (payslip.date_to[:4] == '2017') - code - -result_rate = -contract.fl_unemp_rate(2017) -result = categories.FL_UNEMP_WAGES - -# result_rate of 0 implies 100% due to bug -if result_rate == 0.0: - result = 0.0 - - - - - - - diff --git a/l10n_us_fl_hr_payroll/tests/__init__.py b/l10n_us_fl_hr_payroll/tests/__init__.py index e6fc00b9..64e1cab5 100755 --- a/l10n_us_fl_hr_payroll/tests/__init__.py +++ b/l10n_us_fl_hr_payroll/tests/__init__.py @@ -1,5 +1,2 @@ -# -*- coding: utf-8 -*- - -from . import test_us_fl_payslip_2016 -from . import test_us_fl_payslip_2017 from . import test_us_fl_payslip_2018 +from . import test_us_fl_payslip_2019 diff --git a/l10n_us_fl_hr_payroll/tests/test_us_fl_payslip_2016.py b/l10n_us_fl_hr_payroll/tests/test_us_fl_payslip_2016.py deleted file mode 100755 index 45ad7797..00000000 --- a/l10n_us_fl_hr_payroll/tests/test_us_fl_payslip_2016.py +++ /dev/null @@ -1,104 +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 TestUsFlPayslip(TestUsPayslip): - ### - # 2016 Taxes and Rates - ### - - def test_2016_taxes(self): - salary = 5000.0; - - ## tax maximums - FL_UNEMP_MAX_WAGE = 7000.0 - - - employee = self._createEmployee() - employee.company_id.fl_unemp_rate_2016 = 2.7 - - contract = self._createContract(employee, salary, struct_id=self.ref('l10n_us_fl_hr_payroll.hr_payroll_salary_structure_us_fl_employee')) - - ## tax rates - FL_UNEMP = contract.fl_unemp_rate(2016) / -100.0 - - self._log('2016 Florida tax first payslip:') - payslip = self._createPayslip(employee, '2016-01-01', '2016-01-31') - - payslip.compute_sheet() - - cats = self._getCategories(payslip) - - self.assertPayrollEqual(cats['FL_UNEMP_WAGES'], salary) - self.assertPayrollEqual(cats['FL_UNEMP'], cats['FL_UNEMP_WAGES'] * FL_UNEMP) - - process_payslip(payslip) - - # Make a new payslip, this one will have maximums - - remaining_fl_unemp_wages = FL_UNEMP_MAX_WAGE - salary if (FL_UNEMP_MAX_WAGE - 2*salary < salary) else salary - - self._log('2016 Florida 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['FL_UNEMP_WAGES'], remaining_fl_unemp_wages) - self.assertPayrollEqual(cats['FL_UNEMP'], remaining_fl_unemp_wages * FL_UNEMP) - - - def test_2016_taxes_with_external(self): - salary = 5000.0; - external_wages = 6000.0 - - employee = self._createEmployee() - employee.company_id.fl_unemp_rate_2016 = 2.7 - - contract = self._createContract(employee, salary, external_wages=external_wages, struct_id=self.ref('l10n_us_fl_hr_payroll.hr_payroll_salary_structure_us_fl_employee')) - ## tax maximums - FL_UNEMP_MAX_WAGE = 7000.0 - - ## tax rates - FL_UNEMP = contract.fl_unemp_rate(2016) / -100.0 - - self._log('2016 Forida_external tax first payslip:') - payslip = self._createPayslip(employee, '2016-01-01', '2016-01-31') - - payslip.compute_sheet() - - cats = self._getCategories(payslip) - - self.assertPayrollEqual(cats['FL_UNEMP_WAGES'], FL_UNEMP_MAX_WAGE - external_wages) - self.assertPayrollEqual(cats['FL_UNEMP'], cats['FL_UNEMP_WAGES'] * FL_UNEMP) - - - def test_2016_taxes_with_state_exempt(self): - salary = 5000.0; - external_wages = 6000.0 - - employee = self._createEmployee() - employee.company_id.fl_unemp_rate_2016 = 2.7 - - contract = self._createContract(employee, salary, external_wages=external_wages, struct_id=self.ref( - 'l10n_us_fl_hr_payroll.hr_payroll_salary_structure_us_fl_employee'), futa_type=USHrContract.FUTA_TYPE_BASIC) - ## tax maximums - FL_UNEMP_MAX_WAGE = 7000.0 - - ## tax rates - FL_UNEMP = contract.fl_unemp_rate(2016) / -100.0 - - self.assertPayrollEqual(FL_UNEMP, 0.0) - - self._log('2016 Forida_external tax first payslip:') - payslip = self._createPayslip(employee, '2016-01-01', '2016-01-31') - - payslip.compute_sheet() - - cats = self._getCategories(payslip) - - self.assertPayrollEqual(cats['FL_UNEMP_WAGES'], FL_UNEMP_MAX_WAGE - external_wages) - self.assertPayrollEqual(cats['FL_UNEMP'], cats['FL_UNEMP_WAGES'] * FL_UNEMP) \ No newline at end of file diff --git a/l10n_us_fl_hr_payroll/tests/test_us_fl_payslip_2017.py b/l10n_us_fl_hr_payroll/tests/test_us_fl_payslip_2017.py deleted file mode 100755 index c96d0a9b..00000000 --- a/l10n_us_fl_hr_payroll/tests/test_us_fl_payslip_2017.py +++ /dev/null @@ -1,97 +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 TestUsFlPayslip(TestUsPayslip): - ### - # 2017 Taxes and Rates - ### - FL_UNEMP_MAX_WAGE = 7000.0 - - def test_2017_taxes(self): - salary = 5000.0 - - employee = self._createEmployee() - employee.company_id.fl_unemp_rate_2017 = 2.7 - - contract = self._createContract(employee, salary, struct_id=self.ref('l10n_us_fl_hr_payroll.hr_payroll_salary_structure_us_fl_employee')) - - # tax rates - fl_unemp = contract.fl_unemp_rate(2017) / -100.0 - - self._log('2017 Florida tax first payslip:') - payslip = self._createPayslip(employee, '2017-01-01', '2017-01-31') - - payslip.compute_sheet() - - cats = self._getCategories(payslip) - - self.assertPayrollEqual(cats['FL_UNEMP_WAGES'], salary) - self.assertPayrollEqual(cats['FL_UNEMP'], cats['FL_UNEMP_WAGES'] * fl_unemp) - - process_payslip(payslip) - - # Make a new payslip, this one will have maximums - - remaining_fl_unemp_wages = self.FL_UNEMP_MAX_WAGE - salary if (self.FL_UNEMP_MAX_WAGE - 2*salary < salary) \ - else salary - - self._log('2017 Florida tax second payslip:') - payslip = self._createPayslip(employee, '2017-02-01', '2017-02-28') - - payslip.compute_sheet() - - cats = self._getCategories(payslip) - - self.assertPayrollEqual(cats['FL_UNEMP_WAGES'], remaining_fl_unemp_wages) - self.assertPayrollEqual(cats['FL_UNEMP'], remaining_fl_unemp_wages * fl_unemp) - - def test_2017_taxes_with_external(self): - salary = 5000.0 - external_wages = 6000.0 - - employee = self._createEmployee() - employee.company_id.fl_unemp_rate_2017 = 2.7 - - contract = self._createContract(employee, salary, external_wages=external_wages, - struct_id=self.ref('l10n_us_fl_hr_payroll.hr_payroll_salary_structure_us_fl_employee')) - - # tax rates - fl_unemp = contract.fl_unemp_rate(2017) / -100.0 - - self._log('2017 Forida_external tax first payslip:') - payslip = self._createPayslip(employee, '2017-01-01', '2017-01-31') - - payslip.compute_sheet() - - cats = self._getCategories(payslip) - - self.assertPayrollEqual(cats['FL_UNEMP_WAGES'], self.FL_UNEMP_MAX_WAGE - external_wages) - self.assertPayrollEqual(cats['FL_UNEMP'], cats['FL_UNEMP_WAGES'] * fl_unemp) - - def test_2017_taxes_with_state_exempt(self): - salary = 5000.0 - external_wages = 6000.0 - - employee = self._createEmployee() - employee.company_id.fl_unemp_rate_2017 = 2.7 - - contract = self._createContract(employee, salary, external_wages=external_wages, struct_id=self.ref( - 'l10n_us_fl_hr_payroll.hr_payroll_salary_structure_us_fl_employee'), futa_type=USHrContract.FUTA_TYPE_BASIC) - - # tax rates - fl_unemp = contract.fl_unemp_rate(2017) / -100.0 - - self.assertPayrollEqual(fl_unemp, 0.0) - - self._log('2017 Forida_external tax first payslip:') - payslip = self._createPayslip(employee, '2017-01-01', '2017-01-31') - - payslip.compute_sheet() - - cats = self._getCategories(payslip) - - self.assertPayrollEqual(cats['FL_UNEMP_WAGES'], self.FL_UNEMP_MAX_WAGE - external_wages) - self.assertPayrollEqual(cats['FL_UNEMP'], cats['FL_UNEMP_WAGES'] * fl_unemp) diff --git a/l10n_us_fl_hr_payroll/tests/test_us_fl_payslip_2018.py b/l10n_us_fl_hr_payroll/tests/test_us_fl_payslip_2018.py index 070581ec..566b8b4a 100755 --- a/l10n_us_fl_hr_payroll/tests/test_us_fl_payslip_2018.py +++ b/l10n_us_fl_hr_payroll/tests/test_us_fl_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 @@ -9,18 +7,14 @@ class TestUsFlPayslip(TestUsPayslip): # 2018 Taxes and Rates ### FL_UNEMP_MAX_WAGE = 7000.0 + FL_UNEMP = -2.7 / 100.0 def test_2018_taxes(self): salary = 5000.0 employee = self._createEmployee() - employee.company_id.fl_unemp_rate_2018 = 2.7 - contract = self._createContract(employee, salary, struct_id=self.ref('l10n_us_fl_hr_payroll.hr_payroll_salary_structure_us_fl_employee')) - # tax rates - fl_unemp = contract.fl_unemp_rate(2018) / -100.0 - self._log('2018 Florida tax first payslip:') payslip = self._createPayslip(employee, '2018-01-01', '2018-01-31') @@ -28,8 +22,8 @@ class TestUsFlPayslip(TestUsPayslip): cats = self._getCategories(payslip) - self.assertPayrollEqual(cats['FL_UNEMP_WAGES'], salary) - self.assertPayrollEqual(cats['FL_UNEMP'], cats['FL_UNEMP_WAGES'] * fl_unemp) + self.assertPayrollEqual(cats['WAGE_US_FL_UNEMP'], salary) + self.assertPayrollEqual(cats['ER_US_FL_UNEMP'], cats['WAGE_US_FL_UNEMP'] * self.FL_UNEMP) process_payslip(payslip) @@ -45,22 +39,17 @@ class TestUsFlPayslip(TestUsPayslip): cats = self._getCategories(payslip) - self.assertPayrollEqual(cats['FL_UNEMP_WAGES'], remaining_fl_unemp_wages) - self.assertPayrollEqual(cats['FL_UNEMP'], remaining_fl_unemp_wages * fl_unemp) + self.assertPayrollEqual(cats['WAGE_US_FL_UNEMP'], remaining_fl_unemp_wages) + self.assertPayrollEqual(cats['ER_US_FL_UNEMP'], remaining_fl_unemp_wages * self.FL_UNEMP) def test_2018_taxes_with_external(self): salary = 5000.0 external_wages = 6000.0 employee = self._createEmployee() - employee.company_id.fl_unemp_rate_2018 = 2.7 - contract = self._createContract(employee, salary, external_wages=external_wages, struct_id=self.ref('l10n_us_fl_hr_payroll.hr_payroll_salary_structure_us_fl_employee')) - # tax rates - fl_unemp = contract.fl_unemp_rate(2018) / -100.0 - self._log('2018 Forida_external tax first payslip:') payslip = self._createPayslip(employee, '2018-01-01', '2018-01-31') @@ -68,24 +57,17 @@ class TestUsFlPayslip(TestUsPayslip): cats = self._getCategories(payslip) - self.assertPayrollEqual(cats['FL_UNEMP_WAGES'], self.FL_UNEMP_MAX_WAGE - external_wages) - self.assertPayrollEqual(cats['FL_UNEMP'], cats['FL_UNEMP_WAGES'] * fl_unemp) + self.assertPayrollEqual(cats['WAGE_US_FL_UNEMP'], self.FL_UNEMP_MAX_WAGE - external_wages) + self.assertPayrollEqual(cats['ER_US_FL_UNEMP'], cats['WAGE_US_FL_UNEMP'] * self.FL_UNEMP) def test_2018_taxes_with_state_exempt(self): salary = 5000.0 external_wages = 6000.0 employee = self._createEmployee() - employee.company_id.fl_unemp_rate_2018 = 2.7 - contract = self._createContract(employee, salary, external_wages=external_wages, struct_id=self.ref( 'l10n_us_fl_hr_payroll.hr_payroll_salary_structure_us_fl_employee'), futa_type=USHrContract.FUTA_TYPE_BASIC) - # tax rates - fl_unemp = contract.fl_unemp_rate(2018) / -100.0 - - self.assertPayrollEqual(fl_unemp, 0.0) - self._log('2018 Forida_external tax first payslip:') payslip = self._createPayslip(employee, '2018-01-01', '2018-01-31') @@ -93,5 +75,5 @@ class TestUsFlPayslip(TestUsPayslip): cats = self._getCategories(payslip) - self.assertPayrollEqual(cats['FL_UNEMP_WAGES'], self.FL_UNEMP_MAX_WAGE - external_wages) - self.assertPayrollEqual(cats['FL_UNEMP'], cats['FL_UNEMP_WAGES'] * fl_unemp) + self.assertPayrollEqual(cats.get('WAGE_US_FL_UNEMP', 0.0), 0.0) + self.assertPayrollEqual(cats.get('ER_US_FL_UNEMP', 0.0), 0.0) diff --git a/l10n_us_fl_hr_payroll/tests/test_us_fl_payslip_2019.py b/l10n_us_fl_hr_payroll/tests/test_us_fl_payslip_2019.py new file mode 100755 index 00000000..2d2f3a89 --- /dev/null +++ b/l10n_us_fl_hr_payroll/tests/test_us_fl_payslip_2019.py @@ -0,0 +1,79 @@ +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 TestUsFlPayslip(TestUsPayslip): + ### + # 2019 Taxes and Rates + ### + FL_UNEMP_MAX_WAGE = 7000.0 + FL_UNEMP = -2.7 / 100.0 + + def test_2019_taxes(self): + salary = 5000.0 + + employee = self._createEmployee() + contract = self._createContract(employee, salary, struct_id=self.ref('l10n_us_fl_hr_payroll.hr_payroll_salary_structure_us_fl_employee')) + + self._log('2019 Florida tax first payslip:') + payslip = self._createPayslip(employee, '2019-01-01', '2019-01-31') + + payslip.compute_sheet() + + cats = self._getCategories(payslip) + + self.assertPayrollEqual(cats['WAGE_US_FL_UNEMP'], salary) + self.assertPayrollEqual(cats['ER_US_FL_UNEMP'], cats['WAGE_US_FL_UNEMP'] * self.FL_UNEMP) + + process_payslip(payslip) + + # Make a new payslip, this one will have maximums + + remaining_fl_unemp_wages = self.FL_UNEMP_MAX_WAGE - salary if (self.FL_UNEMP_MAX_WAGE - 2*salary < salary) \ + else salary + + self._log('2019 Florida tax second payslip:') + payslip = self._createPayslip(employee, '2019-02-01', '2019-02-28') + + payslip.compute_sheet() + + cats = self._getCategories(payslip) + + self.assertPayrollEqual(cats['WAGE_US_FL_UNEMP'], remaining_fl_unemp_wages) + self.assertPayrollEqual(cats['ER_US_FL_UNEMP'], remaining_fl_unemp_wages * self.FL_UNEMP) + + def test_2019_taxes_with_external(self): + salary = 5000.0 + external_wages = 6000.0 + + employee = self._createEmployee() + contract = self._createContract(employee, salary, external_wages=external_wages, + struct_id=self.ref('l10n_us_fl_hr_payroll.hr_payroll_salary_structure_us_fl_employee')) + + self._log('2019 Forida_external tax first payslip:') + payslip = self._createPayslip(employee, '2019-01-01', '2019-01-31') + + payslip.compute_sheet() + + cats = self._getCategories(payslip) + + self.assertPayrollEqual(cats['WAGE_US_FL_UNEMP'], self.FL_UNEMP_MAX_WAGE - external_wages) + self.assertPayrollEqual(cats['ER_US_FL_UNEMP'], cats['WAGE_US_FL_UNEMP'] * self.FL_UNEMP) + + def test_2019_taxes_with_state_exempt(self): + salary = 5000.0 + external_wages = 6000.0 + + employee = self._createEmployee() + contract = self._createContract(employee, salary, external_wages=external_wages, struct_id=self.ref( + 'l10n_us_fl_hr_payroll.hr_payroll_salary_structure_us_fl_employee'), futa_type=USHrContract.FUTA_TYPE_BASIC) + + self._log('2019 Forida_external tax first payslip:') + payslip = self._createPayslip(employee, '2019-01-01', '2019-01-31') + + payslip.compute_sheet() + + cats = self._getCategories(payslip) + + self.assertPayrollEqual(cats.get('WAGE_US_FL_UNEMP', 0.0), 0.0) + self.assertPayrollEqual(cats.get('ER_US_FL_UNEMP', 0.0), 0.0) diff --git a/l10n_us_fl_hr_payroll/us_fl_hr_payroll.py b/l10n_us_fl_hr_payroll/us_fl_hr_payroll.py deleted file mode 100755 index 2d6ea1f9..00000000 --- a/l10n_us_fl_hr_payroll/us_fl_hr_payroll.py +++ /dev/null @@ -1,25 +0,0 @@ -from odoo import models, fields, api - - -class USFLHrContract(models.Model): - _inherit = 'hr.contract' - - @api.multi - def fl_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, 'fl_unemp_rate_' + str(year)): - return self.employee_id.company_id['fl_unemp_rate_' + str(year)] - - raise NotImplemented('Year (' + str(year) + ') Not implemented for US Florida.') - - -class FLCompany(models.Model): - _inherit = 'res.company' - - # Defaults from :: http://floridarevenue.com/dor/taxes/reemployment.html - fl_unemp_rate_2016 = fields.Float(string="Florida Unemployment Rate 2016", default=2.7) - fl_unemp_rate_2017 = fields.Float(string="Florida Unemployment Rate 2017", default=2.7) - fl_unemp_rate_2018 = fields.Float(string="Florida Unemployment Rate 2018", default=2.7) diff --git a/l10n_us_fl_hr_payroll/us_fl_hr_payroll_view.xml b/l10n_us_fl_hr_payroll/views/us_fl_hr_payroll_views.xml similarity index 52% rename from l10n_us_fl_hr_payroll/us_fl_hr_payroll_view.xml rename to l10n_us_fl_hr_payroll/views/us_fl_hr_payroll_views.xml index 458f4b84..ee6702bd 100755 --- a/l10n_us_fl_hr_payroll/us_fl_hr_payroll_view.xml +++ b/l10n_us_fl_hr_payroll/views/us_fl_hr_payroll_views.xml @@ -1,21 +1,6 @@ - - res.company.form - res.company - 20 - - - - - - - - - - - hr.contract.form.inherit hr.contract From 46bca4915e9763f4c25cc4ca57de4a9d599fa5c2 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Sun, 10 Feb 2019 15:20:04 -0800 Subject: [PATCH 7/7] MIG `l10n_us_fl_hr_payroll` to 12.0 --- l10n_us_fl_hr_payroll/__manifest__.py | 3 +-- l10n_us_fl_hr_payroll/data/rules.xml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/l10n_us_fl_hr_payroll/__manifest__.py b/l10n_us_fl_hr_payroll/__manifest__.py index 8f88ee3c..4c1312d4 100755 --- a/l10n_us_fl_hr_payroll/__manifest__.py +++ b/l10n_us_fl_hr_payroll/__manifest__.py @@ -1,11 +1,10 @@ -# -*- encoding: utf-8 -*- { 'name': 'USA - Florida - 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::Florida Payroll Rules. =========================== diff --git a/l10n_us_fl_hr_payroll/data/rules.xml b/l10n_us_fl_hr_payroll/data/rules.xml index d8606400..c030fcf1 100755 --- a/l10n_us_fl_hr_payroll/data/rules.xml +++ b/l10n_us_fl_hr_payroll/data/rules.xml @@ -13,7 +13,7 @@ code ### -year = int(payslip.dict.date_to[:4]) +year = payslip.dict.date_to.year rate = payslip.dict.get_rate('US_FL_UNEMP') ytd = payslip.sum('WAGE_US_FL_UNEMP', str(year) + '-01-01', str(year+1) + '-01-01') ytd += contract.external_wages