Victor FeyensandMichaël Mattiello
0eadc0aa5e
Current activity types master data cannot be unlinked through a quite harsh
override of unlink using xml id existence, introduced at 2602642a78.
Some of them are real master data, other could be unlinked if users want it.
Finally custom activity types may cause errors when removed if used in some
side models like server actions or automated actions.
To allow more flexibility we remove the removal constraint and implement
a fallback mechanism. It is implemented in mail.activity.mixin when calling
activity_schedule(xmlid, ...). If the given xmlid is not found
_default_activity_type() specifies the default activity to use. It can
be overridden in modules if some specific behavior is wanted.
e.g.
def _default_activity_type(self):
"""Define a default fallback activity type when xml id not found
only used in in activity_schedule() for now.
"""
try:
return self.env.ref('mail.mail_activity_data_todo')
except Exception:
return False
In this commit we also
* restrict deletion of activity type (hr.plan and ir.actions.server);
* fallback on default activity type if xmlid ref not found in
activity_schedule;
* correct calls to activity_schedule and replace some manual creation calls
by activity_schedule;
Task ID 1961156
PR #39013
Related: odoo/enterprise#6238
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
Co-authored-by: Victor Feyens <vfe@odoo.com>
Co-authored-by: Michaël Mattiello <mcm@odoo.com>
64 lines
2.7 KiB
Python
64 lines
2.7 KiB
Python
# -*- coding: utf-8 -*-
|
|
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
|
|
|
from odoo import api, fields, models, _
|
|
from odoo.exceptions import UserError
|
|
|
|
|
|
class HrPlanActivityType(models.Model):
|
|
_name = 'hr.plan.activity.type'
|
|
_description = 'Plan activity type'
|
|
_rec_name = 'summary'
|
|
|
|
activity_type_id = fields.Many2one(
|
|
'mail.activity.type', 'Activity Type',
|
|
default=lambda self: self.env.ref('mail.mail_activity_data_todo'),
|
|
domain=lambda self: ['|', ('res_model_id', '=', False), ('res_model_id', '=', self.env['ir.model']._get('hr.employee').id)],
|
|
ondelete='restrict'
|
|
)
|
|
summary = fields.Char('Summary')
|
|
responsible = fields.Selection([
|
|
('coach', 'Coach'),
|
|
('manager', 'Manager'),
|
|
('employee', 'Employee'),
|
|
('other', 'Other')], default='employee', string='Responsible', required=True)
|
|
responsible_id = fields.Many2one('res.users', 'Responsible Person', help='Specific responsible of activity if not linked to the employee.')
|
|
note = fields.Html('Note')
|
|
|
|
@api.onchange('activity_type_id')
|
|
def _onchange_activity_type_id(self):
|
|
if self.activity_type_id and self.activity_type_id.summary and not self.summary:
|
|
self.summary = self.activity_type_id.summary
|
|
|
|
def get_responsible_id(self, employee):
|
|
if self.responsible == 'coach':
|
|
if not employee.coach_id:
|
|
raise UserError(_('Coach of employee %s is not set.') % employee.name)
|
|
responsible = employee.coach_id.user_id
|
|
if not responsible:
|
|
raise UserError(_('User of coach of employee %s is not set.') % employee.name)
|
|
elif self.responsible == 'manager':
|
|
if not employee.parent_id:
|
|
raise UserError(_('Manager of employee %s is not set.') % employee.name)
|
|
responsible = employee.parent_id.user_id
|
|
if not responsible:
|
|
raise UserError(_('User of manager of employee %s is not set.') % employee.name)
|
|
elif self.responsible == 'employee':
|
|
responsible = employee.user_id
|
|
if not responsible:
|
|
raise UserError(_('User linked to employee %s is required.') % employee.name)
|
|
elif self.responsible == 'other':
|
|
responsible = self.responsible_id
|
|
if not responsible:
|
|
raise UserError(_('No specific user given on activity.') % employee.name)
|
|
return responsible
|
|
|
|
|
|
class HrPlan(models.Model):
|
|
_name = 'hr.plan'
|
|
_description = 'plan'
|
|
|
|
name = fields.Char('Name', required=True)
|
|
plan_activity_type_ids = fields.Many2many('hr.plan.activity.type', string='Activities')
|
|
active = fields.Boolean(default=True)
|