[UPD] hr_permission_holidays: use permission_type_id instead of calendar
This commit is contained in:
parent
58e1d26451
commit
a4f7c2a7e2
|
|
@ -28,19 +28,19 @@ class HrPersonalPermission(models.Model):
|
|||
('date_to', '<=', date_to)])
|
||||
return date_from, date_to, employee_permissions
|
||||
|
||||
@api.depends('date_to', 'date_from', 'employee_id')
|
||||
@api.depends('date_to', 'date_from', 'employee_id', 'permission_type_id')
|
||||
def get_permission_number(self):
|
||||
for rec in self:
|
||||
if rec.date_to:
|
||||
date_from, date_to, employee_permissions = rec.get_date_to_constrains_value()
|
||||
basic = employee_permissions.filtered(lambda r: r.deduct_from_holiday == False)
|
||||
calender = rec.employee_id.resource_calendar_id
|
||||
permission_type_id = rec.permission_type_id
|
||||
all_perission = 0.0
|
||||
for item in employee_permissions:
|
||||
all_perission += item.duration
|
||||
|
||||
if calender.permission_number - all_perission > 0:
|
||||
rec.permission_number = round(calender.permission_number - all_perission, 2)
|
||||
if permission_type_id.monthly_hours - all_perission > 0:
|
||||
rec.permission_number = round(permission_type_id.monthly_hours - all_perission, 2)
|
||||
|
||||
# @api.onchange('date_to', 'date_from', 'employee_id','deduct_from_holiday')
|
||||
@api.constrains('date_to', 'date_from', 'employee_id', 'deduct_from_holiday')
|
||||
|
|
@ -111,7 +111,7 @@ class HrPersonalPermission(models.Model):
|
|||
|
||||
def _get_date_constrains(self, employee_permissions):
|
||||
for item in self:
|
||||
number_of_per = item.employee_id.contract_id.working_hours.permission_number
|
||||
number_of_per = item.permission_type_id.monthly_hours
|
||||
if employee_permissions:
|
||||
employee_permissions_to = employee_permissions.mapped('date_to')
|
||||
date_to_value = datetime.strptime(str(item.date_to), DEFAULT_SERVER_DATETIME_FORMAT).date()
|
||||
|
|
|
|||
Loading…
Reference in New Issue