[FIX] hr_holidays: reintroduce no_validation leave_type
Since https://github.com/odoo/odoo/commit/59956805424808beed82f1afa5c5e6996e34eb13#diff-ab6382882079a64a861bbba2741a1075 it was impossible to use the no_validation on hr_leave_type. This commit reintroduces this possibility and ensures the leave user gets an actvity for the leave closes odoo/odoo#30806
This commit is contained in:
RomainLibert
committed by
Yannick Tivisse
Yannick Tivisse
parent
0f62a46320
commit
aa21cfcf02
@@ -1724,6 +1724,11 @@ msgstr ""
|
||||
msgid "My Team Leaves"
|
||||
msgstr ""
|
||||
|
||||
#. module: hr_holidays
|
||||
#: model:ir.ui.menu,name:hr_holidays.menu_hr_holidays_dashboard
|
||||
msgid "My Team"
|
||||
msgstr ""
|
||||
|
||||
#. module: hr_holidays
|
||||
#: selection:hr.employee,current_leave_state:0
|
||||
msgid "New"
|
||||
|
||||
@@ -495,6 +495,8 @@ class HolidaysRequest(models.Model):
|
||||
holiday = super(HolidaysRequest, self.with_context(mail_create_nolog=True, mail_create_nosubscribe=True)).create(values)
|
||||
if not self._context.get('leave_fast_create'):
|
||||
holiday.add_follower(employee_id)
|
||||
if holiday.validation_type == 'hr':
|
||||
holiday.message_subscribe(partner_ids=(holiday.employee_id.parent_id.user_id.partner_id | holiday.employee_id.leave_manager_id.partner_id).ids)
|
||||
if employee_id:
|
||||
holiday._onchange_employee_id()
|
||||
if 'number_of_days' not in values and ('date_from' in values or 'date_to' in values):
|
||||
@@ -503,7 +505,7 @@ class HolidaysRequest(models.Model):
|
||||
holiday.sudo().action_validate()
|
||||
holiday.message_subscribe(partner_ids=[holiday._get_responsible_for_approval().partner_id.id])
|
||||
holiday.sudo().message_post(body=_("The leave has been automatically approved"), subtype="mt_comment") # Message from OdooBot (sudo)
|
||||
if not self._context.get('import_file'):
|
||||
elif not self._context.get('import_file'):
|
||||
holiday.activity_update()
|
||||
return holiday
|
||||
|
||||
@@ -704,7 +706,7 @@ class HolidaysRequest(models.Model):
|
||||
employee_requests = self.filtered(lambda hol: hol.holiday_type == 'employee')
|
||||
employee_requests._validate_leave_request()
|
||||
if not self.env.context.get('leave_fast_create'):
|
||||
employee_requests.activity_update()
|
||||
employee_requests.filtered(lambda holiday: holiday.validation_type != 'no_validation').activity_update()
|
||||
return True
|
||||
|
||||
@api.multi
|
||||
@@ -731,48 +733,69 @@ class HolidaysRequest(models.Model):
|
||||
""" Check if target state is achievable. """
|
||||
current_employee = self.env['hr.employee'].search([('user_id', '=', self.env.uid)], limit=1)
|
||||
is_team_leader = self.env.user.has_group('hr_holidays.group_hr_holidays_team_leader')
|
||||
is_officer = self.env.user.has_group('hr_holidays.group_hr_holidays_user')
|
||||
is_manager = self.env.user.has_group('hr_holidays.group_hr_holidays_manager')
|
||||
|
||||
# FIXME This is probably handled by hr_leave_allocation_rule_employee_update ir.rule
|
||||
if state in ['refuse', 'validate1', 'validate'] and not is_team_leader:
|
||||
raise UserError(_('Only a Team Leader, Leave Officer or Manager can approve or refuse leave requests.'))
|
||||
|
||||
for holiday in self:
|
||||
val_type = holiday.holiday_status_id.validation_type
|
||||
if state == 'confirm':
|
||||
continue
|
||||
|
||||
if state == 'draft':
|
||||
if holiday.employee_id != current_employee and not is_manager:
|
||||
raise UserError(_('Only a Leave Manager can reset other people leaves.'))
|
||||
continue
|
||||
if not is_manager:
|
||||
if state == 'confirm':
|
||||
continue
|
||||
elif state == 'draft':
|
||||
if holiday.employee_id != current_employee:
|
||||
raise UserError(_('Only a Leave Manager can reset other people leaves.'))
|
||||
else:
|
||||
# use ir.rule based first access check: department, members, ... (see security.xml)
|
||||
holiday.check_access_rule('write')
|
||||
|
||||
if not is_team_leader:
|
||||
raise UserError(_('Only a Team Leader, Leave Officer or Manager can approve or refuse leave requests.'))
|
||||
# FIXME Should probably be handled via ir.rule
|
||||
# This handles states validate1 validate and refuse
|
||||
if holiday.employee_id == current_employee:
|
||||
raise UserError(_('Only a Leave Manager can approve its own requests.'))
|
||||
|
||||
if is_team_leader:
|
||||
# use ir.rule based first access check: department, members, ... (see security.xml)
|
||||
holiday.check_access_rule('write')
|
||||
if (state == 'validate1' and val_type == 'both') or (state == 'validate' and val_type == 'manager') and holiday.holiday_type == 'employee':
|
||||
manager = holiday.employee_id.parent_id or holiday.employee_id.department_id.manager_id
|
||||
team_leader = holiday.employee_id.leave_manager_id
|
||||
error = False
|
||||
|
||||
if holiday.employee_id == current_employee and not is_manager:
|
||||
raise UserError(_('Only a Leave Manager can approve its own requests.'))
|
||||
if not manager and not team_leader:
|
||||
error = not is_officer
|
||||
else:
|
||||
error = (not (manager and manager == current_employee) and not (team_leader and team_leader == self.env.user))
|
||||
|
||||
if (state == 'validate1' and val_type == 'both') or (state == 'validate' and val_type == 'manager'):
|
||||
manager = holiday.employee_id.parent_id or holiday.employee_id.department_id.manager_id
|
||||
if (manager and manager != current_employee) and not self.env.user.has_group('hr_holidays.group_hr_holidays_manager'):
|
||||
raise UserError(_('You must be either %s\'s manager or Leave manager to approve this leave') % (holiday.employee_id.name))
|
||||
if error:
|
||||
raise UserError(_('You must be either %s\'s manager or Leave manager to approve this leave') % (holiday.employee_id.name))
|
||||
|
||||
if state == 'validate' and val_type == 'both':
|
||||
if not self.env.user.has_group('hr_holidays.group_hr_holidays_manager'):
|
||||
raise UserError(_('Only an Leave Manager can apply the second approval on leave requests.'))
|
||||
if state == 'validate' and val_type == 'both':
|
||||
raise UserError(_('Only an Leave Manager can apply the second approval on leave requests.'))
|
||||
|
||||
# ------------------------------------------------------------
|
||||
# Activity methods
|
||||
# ------------------------------------------------------------
|
||||
|
||||
def _get_responsible_for_approval(self):
|
||||
if self.state == 'confirm' and self.employee_id.leave_manager_id:
|
||||
return self.employee_id.leave_manager_id
|
||||
elif self.state == 'confirm' and self.employee_id.parent_id.user_id:
|
||||
return self.employee_id.parent_id.user_id
|
||||
elif self.department_id.manager_id.user_id:
|
||||
return self.department_id.manager_id.user_id
|
||||
return self.env.user
|
||||
self.ensure_one()
|
||||
responsible = self.env.user
|
||||
|
||||
if self.validation_type == 'hr' or (self.validation_type == 'both' and self.state == 'validate1'):
|
||||
responsible = self.env['res.users'].search([
|
||||
('company_id', '=', self.employee_id.company_id.id),
|
||||
('groups_id', 'in', self.env.ref('hr_holidays.group_hr_holidays_user').id)
|
||||
], limit=1)
|
||||
elif self.state == 'confirm' or (self.state == 'validate' and self.validation_type == 'no_validation'):
|
||||
if self.employee_id.leave_manager_id:
|
||||
responsible = self.employee_id.leave_manager_id
|
||||
elif self.employee_id.parent_id.user_id:
|
||||
responsible = self.employee_id.parent_id.user_id
|
||||
elif self.department_id.manager_id.user_id:
|
||||
responsible = self.department_id.manager_id.user_id
|
||||
|
||||
return responsible
|
||||
|
||||
def activity_update(self):
|
||||
to_clean, to_do = self.env['hr.leave'], self.env['hr.leave']
|
||||
@@ -823,7 +846,7 @@ class HolidaysRequest(models.Model):
|
||||
ref_action = self._notify_get_action_link('controller', controller='/leave/refuse')
|
||||
hr_actions += [{'url': ref_action, 'title': _('Refuse')}]
|
||||
|
||||
holiday_user_group_id = self.env.ref('hr_holidays.group_hr_holidays_user').id
|
||||
holiday_user_group_id = self.env.ref('hr_holidays.group_hr_holidays_team_leader').id
|
||||
new_group = (
|
||||
'group_hr_holidays_user', lambda pdata: pdata['type'] == 'user' and holiday_user_group_id in pdata['groups'], {
|
||||
'actions': hr_actions,
|
||||
|
||||
@@ -338,6 +338,8 @@ class HolidaysAllocation(models.Model):
|
||||
values.update({'department_id': self.env['hr.employee'].browse(employee_id).department_id.id})
|
||||
holiday = super(HolidaysAllocation, self.with_context(mail_create_nolog=True, mail_create_nosubscribe=True)).create(values)
|
||||
holiday.add_follower(employee_id)
|
||||
if holiday.validation_type == 'hr':
|
||||
holiday.message_subscribe(partner_ids=(holiday.employee_id.parent_id.user_id.partner_id | holiday.employee_id.leave_manager_id.partner_id).ids)
|
||||
if 'employee_id' in values:
|
||||
holiday._onchange_employee()
|
||||
holiday.activity_update()
|
||||
@@ -520,6 +522,12 @@ class HolidaysAllocation(models.Model):
|
||||
# ------------------------------------------------------------
|
||||
|
||||
def _get_responsible_for_approval(self):
|
||||
self.ensure_one()
|
||||
if self.validation_type == 'hr' or (self.validation_type == 'both' and self.state == 'validate1'):
|
||||
return self.env['res.users'].search([
|
||||
('company_id', '=', self.employee_id.company_id.id),
|
||||
('groups_id', 'in', self.env.ref('hr_holidays.group_hr_holidays_user').id)
|
||||
], limit=1)
|
||||
if self.state == 'confirm' and self.employee_id.parent_id.user_id:
|
||||
return self.employee_id.parent_id.user_id
|
||||
elif self.department_id.manager_id.user_id:
|
||||
|
||||
@@ -68,14 +68,6 @@ class HolidaysType(models.Model):
|
||||
('hr', 'Payroll Officer'),
|
||||
('manager', 'Team Leader'),
|
||||
('both', 'Team Leader and Payroll Officer')], default='hr', string='Validation By')
|
||||
# TODO: remove me in master, the behavior is exactly the same if you choose 'hr' or 'manager'
|
||||
# in the validation_type field. This field is used only to hide this possibility to the user
|
||||
# to avoid misunderstandings. This field and its corresponding's functions must be removed once
|
||||
# the functional part is implemented.
|
||||
double_validation = fields.Boolean(string='Apply Double Validation',
|
||||
compute='_compute_validation_type', inverse='_inverse_validation_type',
|
||||
help="When selected, the Allocation/Leave Requests for this type require a second validation to be approved.")
|
||||
|
||||
allocation_type = fields.Selection([
|
||||
('fixed', 'Fixed by HR'),
|
||||
('fixed_allocation', 'Fixed by HR + allocation request'),
|
||||
@@ -97,25 +89,6 @@ class HolidaysType(models.Model):
|
||||
leave_notif_subtype_id = fields.Many2one('mail.message.subtype', string='Leave Notification Subtype')
|
||||
allocation_notif_subtype_id = fields.Many2one('mail.message.subtype', string='Allocation Notification Subtype')
|
||||
|
||||
# TODO: remove me in master
|
||||
@api.depends('validation_type')
|
||||
def _compute_validation_type(self):
|
||||
for holiday_type in self:
|
||||
if holiday_type.validation_type == 'both':
|
||||
holiday_type.double_validation = True
|
||||
else:
|
||||
holiday_type.double_validation = False
|
||||
|
||||
# TODO: remove me in master
|
||||
def _inverse_validation_type(self):
|
||||
for holiday_type in self:
|
||||
if holiday_type.double_validation == True:
|
||||
holiday_type.validation_type = 'both'
|
||||
else:
|
||||
#IF to preserve the information (hr or manager)
|
||||
if holiday_type.validation_type == 'both':
|
||||
holiday_type.validation_type = 'hr'
|
||||
|
||||
@api.multi
|
||||
@api.constrains('validity_start', 'validity_stop')
|
||||
def _check_validity_dates(self):
|
||||
|
||||
@@ -37,8 +37,8 @@
|
||||
options='{"terminology": "archive"}'/>
|
||||
</button>
|
||||
</div>
|
||||
<div class="oe_title">
|
||||
<h1><field name="name"/></h1>
|
||||
<div class="oe_title">
|
||||
<h1><field name="name"/></h1>
|
||||
</div>
|
||||
<group>
|
||||
<group name="description" string="Options">
|
||||
@@ -49,8 +49,7 @@
|
||||
<field name="time_type" groups="base.group_no_one"/>
|
||||
</group>
|
||||
<group name="validation" string="Validation">
|
||||
<field name="validation_type" widget="radio" invisible="1"/>
|
||||
<field name="double_validation"/>
|
||||
<field name="validation_type" widget="radio"/>
|
||||
</group>
|
||||
<group name="visibility" string="Allocation">
|
||||
<field name="allocation_type" widget="radio" force_save="1"/>
|
||||
@@ -111,8 +110,7 @@
|
||||
<field name="display_name"/>
|
||||
<field name="code"/>
|
||||
<field name="allocation_type"/>
|
||||
<field name="validation_type" invisible="1"/>
|
||||
<field name="double_validation"/>
|
||||
<field name="validation_type"/>
|
||||
<field name="validity_start"/>
|
||||
<field name="validity_stop"/>
|
||||
</tree>
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
<separator/>
|
||||
<filter string="Unread Messages" name="message_needaction" domain="[('message_needaction','=',True)]"/>
|
||||
<separator/>
|
||||
<filter string="My Department Leaves" name="department" domain="[('department_id.member_ids.user_id', '=', uid)]" help="My Department Leaves"/>
|
||||
<filter string="My Department Leaves" name="department" domain="['|', ('department_id.member_ids.user_id', '=', uid), ('employee_id.user_id', '=', uid)]" help="My Department Leaves"/>
|
||||
<filter string="People I Manage" name="managed_people" domain="[('employee_id.parent_id.user_id', '=', uid)]" help="Leaves of people you are manager of"/>
|
||||
<filter string="My Team Leaves" name="my_team_leaves" domain="[('employee_id.leave_manager_id', '=', uid)]" groups="hr_holidays.group_hr_holidays_team_leader" help="Leaves of Your Team Members"/>
|
||||
<filter string="My Leaves" name="my_leaves" domain="[('employee_id.user_id', '=', uid)]"/>
|
||||
@@ -349,7 +349,7 @@
|
||||
<field name="res_model">hr.leave</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">calendar</field>
|
||||
<field name="context">{'search_default_year': 1, 'search_default_group_employee': 1, 'search_default_managed_people': 1, 'search_default_my_leaves': 1}</field>
|
||||
<field name="context">{'search_default_year': 1, 'search_default_group_employee': 1, 'search_default_managed_people': 1, 'search_default_managed_people': 1, 'search_default_my_team_leaves': 1}</field>
|
||||
<field name="domain">[('holiday_type','=','employee'), ('state', '!=', 'refuse')]</field>
|
||||
<field name="search_view_id" ref="view_hr_holidays_filter"/>
|
||||
</record>
|
||||
@@ -363,7 +363,7 @@
|
||||
|
||||
<menuitem
|
||||
id="menu_hr_holidays_dashboard"
|
||||
name="Overview"
|
||||
name="My Team"
|
||||
parent="menu_hr_holidays_root"
|
||||
sequence="1"
|
||||
action="action_hr_holidays_dashboard"
|
||||
@@ -509,7 +509,8 @@
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,kanban,form,calendar,activity</field>
|
||||
<field name="context">{
|
||||
'search_default_department':1,
|
||||
'search_default_managed_people': 1,
|
||||
'search_default_my_team_leaves': 1
|
||||
'search_default_approve':1}
|
||||
</field>
|
||||
<field name="domain">[]</field>
|
||||
|
||||
Reference in New Issue
Block a user