From 6ca232dcb2b7336a93412423c81c16a1e92a51a1 Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Tue, 12 Mar 2019 11:20:02 -0700 Subject: [PATCH] MIG `hr_payroll_attendance` to 12.0 --- hr_payroll_attendance/__manifest__.py | 2 +- hr_payroll_attendance/hr_payslip.py | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/hr_payroll_attendance/__manifest__.py b/hr_payroll_attendance/__manifest__.py index 4aa42648..9a1e4976 100755 --- a/hr_payroll_attendance/__manifest__.py +++ b/hr_payroll_attendance/__manifest__.py @@ -1,7 +1,7 @@ { 'name': 'Attendance on Payslips', 'description': 'Get Attendence numbers onto Employee Payslips.', - 'version': '11.0.1.0.0', + 'version': '12.0.1.0.0', 'website': 'https://hibou.io/', 'author': 'Hibou Corp. ', 'license': 'AGPL-3', diff --git a/hr_payroll_attendance/hr_payslip.py b/hr_payroll_attendance/hr_payslip.py index e4561032..2d028793 100755 --- a/hr_payroll_attendance/hr_payslip.py +++ b/hr_payroll_attendance/hr_payslip.py @@ -1,8 +1,6 @@ -from datetime import datetime from collections import defaultdict from odoo import api, models from odoo.exceptions import ValidationError -from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT class HrPayslip(models.Model): @@ -41,8 +39,7 @@ class HrPayslip(models.Model): raise ValidationError('This pay period must not have any open attendances.') if attn.worked_hours: # Avoid in/outs - attn_start_time = datetime.strptime(attn.check_in, DEFAULT_SERVER_DATETIME_FORMAT) - attn_iso = attn_start_time.isocalendar() + attn_iso = attn.check_in.isocalendar() if not attn_iso in days: worked_attn['number_of_days'] += 1 days.add(attn_iso) @@ -73,8 +70,7 @@ class HrPayslip(models.Model): raise ValidationError('This pay period must not have any open attendances.') if attn.worked_hours: # Avoid in/outs - attn_start_time = datetime.strptime(attn.check_in, DEFAULT_SERVER_DATETIME_FORMAT) - attn_iso = attn_start_time.isocalendar() + attn_iso = attn.check_in.isocalendar() day_values[attn_iso] += attn.worked_hours return day_values elif hasattr(super(HrPayslip, self), 'hour_break_down'):