pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] hr_holidays: set correct domain on holiday_status_id

Browse Source
This commit is contained in:
RomainLibert
2019-09-11 09:27:41 +00:00
committed by Yannick Tivisse
parent dbf76300f9
commit 5a2e8f6fee
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_holidays/models/hr_leave_allocation.py
+6 -1
View File
@@ -35,6 +35,11 @@ class HolidaysAllocation(models.Model):
domain = [('valid', '=', True), ('allocation_type', '=', 'fixed_allocation')]
return self.env['hr.leave.type'].search(domain, limit=1)
def _holiday_status_id_domain(self):
if self.user_has_groups('hr_holidays.group_hr_holidays_manager'):
return [('valid', '=', True), ('allocation_type', '!=', 'no')]
return [('valid', '=', True), ('allocation_type', '=', 'fixed_allocation')]
name = fields.Char('Description')
state = fields.Selection([
('draft', 'To Submit'),
@@ -57,7 +62,7 @@ class HolidaysAllocation(models.Model):
holiday_status_id = fields.Many2one(
"hr.leave.type", string="Time Off Type", required=True, readonly=True,
states={'draft': [('readonly', False)], 'confirm': [('readonly', False)]},
domain=[('valid', '=', True), ('allocation_type', '!=', 'no')], default=_default_holiday_status_id)
domain=_holiday_status_id_domain, default=_default_holiday_status_id)
employee_id = fields.Many2one(
'hr.employee', string='Employee', index=True, readonly=True, ondelete="restrict",
states={'draft': [('readonly', False)], 'confirm': [('readonly', False)]}, default=_default_employee, tracking=True)