audrius/suite
1
0
Fork 1
mirror of https://gitlab.com/hibou-io/hibou-odoo/suite.git synced 2025-01-20 12:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

MIG hr_payroll_attendance to 12.0

Browse Source
This commit is contained in:
Jared Kipe
2019-03-12 11:20:02 -07:00
committed by Jared Kipe
parent da26919f50
commit 6ca232dcb2
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hr_payroll_attendance/__manifest__.py
View File

@@ -1,7 +1,7 @@
{ {
'name': 'Attendance on Payslips', 'name': 'Attendance on Payslips',
'description': 'Get Attendence numbers onto Employee Payslips.', 'description': 'Get Attendence numbers onto Employee Payslips.',
'version': '11.0.1.0.0', 'version': '12.0.1.0.0',
'website': 'https://hibou.io/', 'website': 'https://hibou.io/',
'author': 'Hibou Corp. <hello@hibou.io>', 'author': 'Hibou Corp. <hello@hibou.io>',
'license': 'AGPL-3', 'license': 'AGPL-3',

8
hr_payroll_attendance/hr_payslip.py
View File

@@ -1,8 +1,6 @@
from datetime import datetime
from collections import defaultdict from collections import defaultdict
from odoo import api, models from odoo import api, models
from odoo.exceptions import ValidationError from odoo.exceptions import ValidationError
from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT
class HrPayslip(models.Model): class HrPayslip(models.Model):
@@ -41,8 +39,7 @@ class HrPayslip(models.Model):
raise ValidationError('This pay period must not have any open attendances.') raise ValidationError('This pay period must not have any open attendances.')
if attn.worked_hours: if attn.worked_hours:
# Avoid in/outs # Avoid in/outs
attn_start_time = datetime.strptime(attn.check_in, DEFAULT_SERVER_DATETIME_FORMAT) attn_iso = attn.check_in.isocalendar()
attn_iso = attn_start_time.isocalendar()
if not attn_iso in days: if not attn_iso in days:
worked_attn['number_of_days'] += 1 worked_attn['number_of_days'] += 1
days.add(attn_iso) days.add(attn_iso)
@@ -73,8 +70,7 @@ class HrPayslip(models.Model):
raise ValidationError('This pay period must not have any open attendances.') raise ValidationError('This pay period must not have any open attendances.')
if attn.worked_hours: if attn.worked_hours:
# Avoid in/outs # Avoid in/outs
attn_start_time = datetime.strptime(attn.check_in, DEFAULT_SERVER_DATETIME_FORMAT) attn_iso = attn.check_in.isocalendar()
attn_iso = attn_start_time.isocalendar()
day_values[attn_iso] += attn.worked_hours day_values[attn_iso] += attn.worked_hours
return day_values return day_values
elif hasattr(super(HrPayslip, self), 'hour_break_down'): elif hasattr(super(HrPayslip, self), 'hour_break_down'):