From 5dd9753ef2ecf62389d53bc3236ee6979c7c5515 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Mon, 20 May 2019 16:06:24 -0700 Subject: [PATCH] MIG `hr_payroll_slip_ytd` to 12.0 --- hr_payroll_slip_ytd/__manifest__.py | 2 +- hr_payroll_slip_ytd/models/payslip.py | 2 +- hr_payroll_slip_ytd/views/payslip_views.xml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hr_payroll_slip_ytd/__manifest__.py b/hr_payroll_slip_ytd/__manifest__.py index 52aaf5f7..eff0199d 100755 --- a/hr_payroll_slip_ytd/__manifest__.py +++ b/hr_payroll_slip_ytd/__manifest__.py @@ -1,7 +1,7 @@ { 'name': 'Payroll Report Year to Date', 'author': 'Hibou Corp. ', - 'version': '11.0.1.0.0', + 'version': '12.0.1.0.0', 'category': 'Human Resources', 'sequence': 95, 'summary': 'Show YTD computations on Payslip Report', diff --git a/hr_payroll_slip_ytd/models/payslip.py b/hr_payroll_slip_ytd/models/payslip.py index 44a4a59c..1dd7cbcf 100644 --- a/hr_payroll_slip_ytd/models/payslip.py +++ b/hr_payroll_slip_ytd/models/payslip.py @@ -6,7 +6,7 @@ class Payslip(models.Model): def ytd(self, code, allow_draft=False): to_date = self.date_to - from_date = self.date_to[:4] + '-01-01' + from_date = str(self.date_to.year) + '-01-01' state_allowed = ('done', 'verify') if not allow_draft else ('done', 'verify', 'draft') self.env.cr.execute(""" SELECT sum(total) as sum diff --git a/hr_payroll_slip_ytd/views/payslip_views.xml b/hr_payroll_slip_ytd/views/payslip_views.xml index be97b94f..1e80ce7c 100644 --- a/hr_payroll_slip_ytd/views/payslip_views.xml +++ b/hr_payroll_slip_ytd/views/payslip_views.xml @@ -2,13 +2,13 @@ \ No newline at end of file