Lucas Lefèvre
f6b1e3144b
In resource, calendar.attendances with a resource_id specified were taken into account to compute the average hours per day. This is incorrect and could lead to hours_per_day being > 24h. Also when hr_payroll is installed, attendance_ids is replaced by normal attendance (those without a resource_id set) in the view. The onchange method was not called to recompute the average hours per day. This commit fixes both issues. closes odoo/odoo#29951
72 lines
3.1 KiB
Python
72 lines
3.1 KiB
Python
# -*- coding:utf-8 -*-
|
|
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
|
from odoo import models, fields, api
|
|
from odoo.osv.expression import AND, OR
|
|
|
|
|
|
class ResourceCalendar(models.Model):
|
|
_inherit = 'resource.calendar'
|
|
|
|
# UI fields
|
|
normal_attendance_ids = fields.One2many(
|
|
'resource.calendar.attendance', 'calendar_id', 'Normal working Time',
|
|
domain=[('resource_id', '=', False)])
|
|
|
|
extra_attendance_ids = fields.One2many(
|
|
'resource.calendar.attendance', 'calendar_id', 'Employees working Time',
|
|
domain=[('resource_id', '!=', False)])
|
|
|
|
def _get_global_attendances(self):
|
|
res = super(ResourceCalendar, self)._get_global_attendances()
|
|
res |= self.normal_attendance_ids.filtered(lambda attendance: not attendance.date_from and not attendance.date_to)
|
|
return res
|
|
|
|
# Add a key on the api.onchange decorator
|
|
@api.onchange('attendance_ids', 'normal_attendance_ids')
|
|
def _onchange_hours_per_day(self):
|
|
return super(ResourceCalendar, self)._onchange_hours_per_day()
|
|
|
|
class ResourceCalendarAttendance(models.Model):
|
|
_inherit = 'resource.calendar.attendance'
|
|
|
|
def _default_benefit_type_id(self):
|
|
return self.env.ref('hr_payroll.benefit_type_attendance', raise_if_not_found=False)
|
|
|
|
benefit_type_id = fields.Many2one('hr.benefit.type', 'Benefit Type', default=_default_benefit_type_id)
|
|
|
|
class ResourceCalendarLeave(models.Model):
|
|
_inherit = 'resource.calendar.leaves'
|
|
benefit_type_id = fields.Many2one('hr.benefit.type', 'Benefit Type')
|
|
|
|
|
|
class ResourceMixin(models.AbstractModel):
|
|
_inherit = "resource.mixin"
|
|
|
|
def get_benefit_days_data(self, benefit_type, from_datetime, to_datetime, calendar=None):
|
|
"""
|
|
By default the resource calendar is used, but it can be
|
|
changed using the `calendar` argument.
|
|
|
|
Returns a dict {'days': n, 'hours': h} containing the number of leaves
|
|
expressed as days and as hours.
|
|
"""
|
|
resource = self.resource_id
|
|
calendar = calendar or self.resource_calendar_id
|
|
benefit_type_ids = benefit_type.ids
|
|
if benefit_type == self.env.ref('hr_payroll.benefit_type_attendance'): # special case for global attendances
|
|
benefit_type_ids += [False]# no benefit type = normal/global attendance
|
|
domain = [('benefit_type_id', 'in', benefit_type_ids)]
|
|
|
|
# naive datetimes are made explicit in UTC
|
|
from_datetime = self._timezone_datetime(from_datetime)
|
|
to_datetime = self._timezone_datetime(to_datetime)
|
|
|
|
day_total = self._get_day_total(from_datetime, to_datetime, calendar, resource)
|
|
# actual hours per day
|
|
if benefit_type.is_leave:
|
|
intervals = calendar._attendance_intervals(from_datetime, to_datetime, resource) & calendar._leave_intervals(from_datetime, to_datetime, resource, domain) # use domain to only retrieve leaves of this type
|
|
else:
|
|
intervals = calendar._attendance_intervals(from_datetime, to_datetime, resource, domain) - calendar._leave_intervals(from_datetime, to_datetime, resource)
|
|
|
|
return self._get_days_data(intervals, day_total)
|