From 47f5bd4f203f47b15866b5987792a2b44d6b5049 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Sun, 10 Feb 2019 15:43:08 -0800 Subject: [PATCH] MIG `l10n_us_oh_hr_payroll` to 12.0 --- l10n_us_oh_hr_payroll/__init__.py | 2 -- l10n_us_oh_hr_payroll/__manifest__.py | 3 +-- l10n_us_oh_hr_payroll/data/rules.xml | 4 ++-- l10n_us_oh_hr_payroll/tests/__init__.py | 2 -- l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2018.py | 2 -- l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2019.py | 2 -- 6 files changed, 3 insertions(+), 12 deletions(-) diff --git a/l10n_us_oh_hr_payroll/__init__.py b/l10n_us_oh_hr_payroll/__init__.py index cde864ba..0650744f 100755 --- a/l10n_us_oh_hr_payroll/__init__.py +++ b/l10n_us_oh_hr_payroll/__init__.py @@ -1,3 +1 @@ -# -*- coding: utf-8 -*- - from . import models diff --git a/l10n_us_oh_hr_payroll/__manifest__.py b/l10n_us_oh_hr_payroll/__manifest__.py index 11d30094..ea602ecd 100755 --- a/l10n_us_oh_hr_payroll/__manifest__.py +++ b/l10n_us_oh_hr_payroll/__manifest__.py @@ -1,11 +1,10 @@ -# -*- encoding: utf-8 -*- { 'name': 'USA - Ohio - 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::Ohio Payroll Rules. ======================== diff --git a/l10n_us_oh_hr_payroll/data/rules.xml b/l10n_us_oh_hr_payroll/data/rules.xml index 56175d24..db60a9c1 100755 --- a/l10n_us_oh_hr_payroll/data/rules.xml +++ b/l10n_us_oh_hr_payroll/data/rules.xml @@ -14,7 +14,7 @@ ### rate = payslip.dict.get_rate('US_OH_UNEMP') -year = int(payslip.dict.date_to[:4]) +year = payslip.dict.date_to.year ytd = payslip.sum('WAGE_US_OH_UNEMP', str(year) + '-01-01', str(year+1) + '-01-01') ytd += contract.external_wages remaining = rate.wage_limit_year - ytd @@ -57,7 +57,7 @@ if result_rate == 0.0: result = True code -year = int(payslip.dict.date_to[:4]) +year = payslip.dict.date_to.year wages = categories.GROSS allowances = contract.oh_income_allowances schedule_pay = contract.schedule_pay diff --git a/l10n_us_oh_hr_payroll/tests/__init__.py b/l10n_us_oh_hr_payroll/tests/__init__.py index c9dbd2ee..d7ed2c2e 100755 --- a/l10n_us_oh_hr_payroll/tests/__init__.py +++ b/l10n_us_oh_hr_payroll/tests/__init__.py @@ -1,4 +1,2 @@ -# -*- coding: utf-8 -*- - 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 30c735b1..b4b7f1af 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 @@ -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 diff --git a/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2019.py b/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2019.py index 1687d654..0783ad36 100755 --- a/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2019.py +++ b/l10n_us_oh_hr_payroll/tests/test_us_oh_payslip_2019.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