From ce776494bd42d841978c3f65ba3c2249d41b45f1 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Sun, 10 Feb 2019 15:13:48 -0800 Subject: [PATCH] MIG `l10n_us_ca_hr_payroll` to 12.0 --- l10n_us_ca_hr_payroll/__manifest__.py | 2 +- l10n_us_ca_hr_payroll/data/rules.xml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/l10n_us_ca_hr_payroll/__manifest__.py b/l10n_us_ca_hr_payroll/__manifest__.py index 7486370d..b4dd1c3a 100755 --- a/l10n_us_ca_hr_payroll/__manifest__.py +++ b/l10n_us_ca_hr_payroll/__manifest__.py @@ -4,7 +4,7 @@ 'license': 'AGPL-3', 'category': 'Localization', 'depends': ['l10n_us_hr_payroll'], - 'version': '11.0.2019.0.0', + 'version': '12.0.2019.0.0', 'description': """ USA::California Payroll Rules. ============================== diff --git a/l10n_us_ca_hr_payroll/data/rules.xml b/l10n_us_ca_hr_payroll/data/rules.xml index c5e7d73c..b6155f9c 100755 --- a/l10n_us_ca_hr_payroll/data/rules.xml +++ b/l10n_us_ca_hr_payroll/data/rules.xml @@ -15,7 +15,7 @@ ### rate = payslip.dict.get_rate('US_CA_UNEMP') -year = int(payslip.dict.date_to[:4]) +year = payslip.dict.date_to.year ytd = payslip.sum('WAGE_US_CA_UNEMP', str(year) + '-01-01', str(year+1) + '-01-01') ytd += contract.external_wages remaining = rate.wage_limit_year - ytd @@ -62,7 +62,7 @@ if result_rate == 0.0: ### rate = payslip.dict.get_rate('US_CA_ETT') -year = int(payslip.dict.date_to[:4]) +year = payslip.dict.date_to.year ytd = payslip.sum('WAGE_US_CA_ETT', str(year) + '-01-01', str(year+1) + '-01-01') ytd += contract.external_wages remaining = rate.wage_limit_year - ytd @@ -109,7 +109,7 @@ if result_rate == 0.0: ### rate = payslip.dict.get_rate('US_CA_SDI') -year = int(payslip.dict.date_to[:4]) +year = payslip.dict.date_to.year ytd = payslip.sum('WAGE_US_CA_SDI', str(year) + '-01-01', str(year+1) + '-01-01') ytd += contract.external_wages remaining = rate.wage_limit_year - ytd @@ -154,7 +154,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.ca_de4_allowances additional_allowances = contract.ca_additional_allowances