From 11f6b294bdcfb82b1493fddf153de60c89df9ebf Mon Sep 17 00:00:00 2001 From: Nirali Sapra Date: Tue, 19 Dec 2017 14:48:22 +0100 Subject: [PATCH] [IMP] mail: don't delete in-use activity types, archive them instead --- addons/mail/models/mail_activity.py | 3 ++- addons/mail/views/mail_activity_views.xml | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/addons/mail/models/mail_activity.py b/addons/mail/models/mail_activity.py index a385b66bf1f..b6707e0704e 100644 --- a/addons/mail/models/mail_activity.py +++ b/addons/mail/models/mail_activity.py @@ -19,6 +19,7 @@ class MailActivityType(models.Model): name = fields.Char('Name', required=True, translate=True) summary = fields.Char('Summary', translate=True) sequence = fields.Integer('Sequence', default=10) + active = fields.Boolean(default=True) days = fields.Integer( '# Days', default=0, help='Number of days before executing the action. It allows to plan the action deadline.') @@ -71,7 +72,7 @@ class MailActivity(models.Model): # activity activity_type_id = fields.Many2one( 'mail.activity.type', 'Activity', - domain="['|', ('res_model_id', '=', False), ('res_model_id', '=', res_model_id)]") + domain="['|', ('res_model_id', '=', False), ('res_model_id', '=', res_model_id)]", ondelete='restrict') activity_category = fields.Selection(related='activity_type_id.category') icon = fields.Char('Icon', related='activity_type_id.icon') summary = fields.Char('Summary') diff --git a/addons/mail/views/mail_activity_views.xml b/addons/mail/views/mail_activity_views.xml index 5e9906cc416..f5548d8ca4d 100644 --- a/addons/mail/views/mail_activity_views.xml +++ b/addons/mail/views/mail_activity_views.xml @@ -6,6 +6,11 @@
+
+ +