From 5ec2cb09a5a37f4febe28e6edc3188a3467ecdcb Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Sun, 10 Feb 2019 16:14:49 -0800 Subject: [PATCH] MIG `l10n_us_mo_hr_payroll` for 12.0 --- l10n_us_mo_hr_payroll/__manifest__.py | 3 +-- l10n_us_mo_hr_payroll/data/rules.xml | 4 ++-- l10n_us_mo_hr_payroll/tests/test_us_mo_payslip_2018.py | 2 -- l10n_us_mo_hr_payroll/tests/test_us_mo_payslip_2019.py | 2 -- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/l10n_us_mo_hr_payroll/__manifest__.py b/l10n_us_mo_hr_payroll/__manifest__.py index 964e1718..636d550e 100755 --- a/l10n_us_mo_hr_payroll/__manifest__.py +++ b/l10n_us_mo_hr_payroll/__manifest__.py @@ -1,11 +1,10 @@ -# -*- encoding: utf-8 -*- { 'name': 'USA - Missouri - Payroll', 'author': 'Hibou Corp. ', 'license': 'AGPL-3', 'category': 'Localization', 'depends': ['l10n_us_hr_payroll'], - 'version': '11.0.2018.0.0', + 'version': '12.0.2019.0.0', 'description': """ USA::Missouri Payroll Rules. ============================ diff --git a/l10n_us_mo_hr_payroll/data/rules.xml b/l10n_us_mo_hr_payroll/data/rules.xml index 9d0cfac4..7107c5ac 100755 --- a/l10n_us_mo_hr_payroll/data/rules.xml +++ b/l10n_us_mo_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_MO_UNEMP') ytd = payslip.sum('WAGE_US_MO_UNEMP', str(year) + '-01-01', str(year+1) + '-01-01') ytd += contract.external_wages @@ -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 exemptions = contract.mo_mow4_exemptions filing_status = contract.mo_mow4_filing_status diff --git a/l10n_us_mo_hr_payroll/tests/test_us_mo_payslip_2018.py b/l10n_us_mo_hr_payroll/tests/test_us_mo_payslip_2018.py index 1197d5aa..5ba3bf66 100755 --- a/l10n_us_mo_hr_payroll/tests/test_us_mo_payslip_2018.py +++ b/l10n_us_mo_hr_payroll/tests/test_us_mo_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 diff --git a/l10n_us_mo_hr_payroll/tests/test_us_mo_payslip_2019.py b/l10n_us_mo_hr_payroll/tests/test_us_mo_payslip_2019.py index 12030a19..9d3cd1f0 100755 --- a/l10n_us_mo_hr_payroll/tests/test_us_mo_payslip_2019.py +++ b/l10n_us_mo_hr_payroll/tests/test_us_mo_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