diff --git a/l10n_us_hr_payroll/__init__.py b/l10n_us_hr_payroll/__init__.py index cde864ba..0650744f 100755 --- a/l10n_us_hr_payroll/__init__.py +++ b/l10n_us_hr_payroll/__init__.py @@ -1,3 +1 @@ -# -*- coding: utf-8 -*- - from . import models diff --git a/l10n_us_hr_payroll/__manifest__.py b/l10n_us_hr_payroll/__manifest__.py index e695b180..dd863641 100755 --- a/l10n_us_hr_payroll/__manifest__.py +++ b/l10n_us_hr_payroll/__manifest__.py @@ -1,11 +1,10 @@ -# -*- encoding: utf-8 -*- { 'name': 'USA - Payroll', 'author': 'Hibou Corp. ', 'license': 'AGPL-3', 'category': 'Localization', 'depends': ['hr_payroll', 'hr_payroll_rate'], - 'version': '11.0.2018.1.0', + 'version': '12.0.2019.1.0', 'description': """ USA Payroll Rules. ================== diff --git a/l10n_us_hr_payroll/data/rules.xml b/l10n_us_hr_payroll/data/rules.xml index b0abf7cf..469f62f7 100755 --- a/l10n_us_hr_payroll/data/rules.xml +++ b/l10n_us_hr_payroll/data/rules.xml @@ -14,7 +14,7 @@ code ### -year = int(payslip.dict.date_to[:4]) +year = payslip.dict.date_to.year ytd = payslip.sum('WAGE_US_FICA_SS', str(year) + '-01-01', str(year+1) + '-01-01') ytd += contract.external_wages rate = payslip.dict.get_rate('US_FICA_SS') @@ -52,7 +52,7 @@ else: ### rate = payslip.dict.get_rate('US_FICA_M_ADD') ADD_M = rate.wage_limit_year -year = int(payslip.dict.date_to[:4]) +year = payslip.dict.date_to.year norm_med_ytd = payslip.sum('WAGE_US_FICA_M', str(year) + '-01-01', str(year+1) + '-01-01') norm_med_cur = categories.WAGE_US_FICA_M @@ -124,7 +124,7 @@ result = categories.WAGE_US_FICA_M_ADD result = (contract.w4_filing_status != 'married' and contract.w4_filing_status) code -year = int(payslip.dict.date_to[:4]) +year = payslip.dict.date_to.year wages = categories.GROSS allowances = contract.w4_allowances is_nra = contract.w4_is_nonresident_alien @@ -560,7 +560,7 @@ result = -(val + additional) result = (contract.w4_filing_status == 'married') code -year = int(payslip.dict.date_to[:4]) +year = payslip.dict.date_to.year wages = categories.GROSS allowances = contract.w4_allowances is_nra = contract.w4_is_nonresident_alien @@ -999,7 +999,7 @@ result = -(val + additional) ### rate = payslip.dict.get_futa_rate(contract) -year = int(payslip.dict.date_to[:4]) +year = payslip.dict.date_to.year ytd = payslip.sum('WAGE_US_FUTA', str(year) + '-01-01', str(year+1) + '-01-01') ytd += contract.external_wages remaining = rate.wage_limit_year - ytd @@ -1021,7 +1021,7 @@ else: result = (contract.futa_type != contract.FUTA_TYPE_EXEMPT) code -year = int(payslip.dict.date_to[:4]) +year = payslip.dict.date_to.year rate = payslip.dict.get_futa_rate(contract) result_rate = -(rate.rate) result = categories.WAGE_US_FUTA diff --git a/l10n_us_hr_payroll/tests/__init__.py b/l10n_us_hr_payroll/tests/__init__.py index 984a9040..abe27c5a 100755 --- a/l10n_us_hr_payroll/tests/__init__.py +++ b/l10n_us_hr_payroll/tests/__init__.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - from . import test_us_payslip from . import test_us_payslip_2018 from . import test_us_payslip_2019 diff --git a/l10n_us_hr_payroll/tests/test_us_payslip.py b/l10n_us_hr_payroll/tests/test_us_payslip.py index 6e8248d0..e25642fc 100755 --- a/l10n_us_hr_payroll/tests/test_us_payslip.py +++ b/l10n_us_hr_payroll/tests/test_us_payslip.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - from logging import getLogger from sys import float_info as sys_float_info