diff --git a/mail_activity_plan/__manifest__.py b/mail_activity_plan/__manifest__.py index 7ecc508..746bb3a 100644 --- a/mail_activity_plan/__manifest__.py +++ b/mail_activity_plan/__manifest__.py @@ -3,7 +3,7 @@ { "name": "mail_activity_plan", - "version": "14.0.1.0.0", + "version": "14.0.1.1.0", "author": "Elabore", "website": "https://github.com/elabore-coop/ux-tools", "maintainer": "Laetitia Da Costa", diff --git a/mail_activity_plan/models/mail_activity_plan.py b/mail_activity_plan/models/mail_activity_plan.py index 30996e5..e4e5cad 100644 --- a/mail_activity_plan/models/mail_activity_plan.py +++ b/mail_activity_plan/models/mail_activity_plan.py @@ -22,7 +22,7 @@ class MailActivityTemplate(models.Model): sequence = fields.Integer('Sequence', default=1, help="Used to order activities.") summary = fields.Char('Summary', compute="_compute_default_summary", store=True, readonly=False) user_id = fields.Many2one('res.users', string='Assigned to') - note = fields.Html('Note') + note = fields.Html('Note', compute="_compute_default_note", store=True, readonly=False) @api.depends('mail_activity_type_id') def _compute_default_summary(self): @@ -30,6 +30,12 @@ class MailActivityTemplate(models.Model): if not mail_activity_template.summary and mail_activity_template.mail_activity_type_id and mail_activity_template.mail_activity_type_id.summary: mail_activity_template.summary = mail_activity_template.mail_activity_type_id.summary + @api.depends('mail_activity_type_id') + def _compute_default_note(self): + for mail_activity_template in self: + if not mail_activity_template.note and mail_activity_template.mail_activity_type_id and mail_activity_template.mail_activity_type_id.default_description: + mail_activity_template.note = mail_activity_template.mail_activity_type_id.default_description + class MailActivityPlan(models.Model): ''' Create a plan diff --git a/mail_activity_plan/views/mail_activity_plan_view.xml b/mail_activity_plan/views/mail_activity_plan_view.xml index f124608..371327f 100644 --- a/mail_activity_plan/views/mail_activity_plan_view.xml +++ b/mail_activity_plan/views/mail_activity_plan_view.xml @@ -53,6 +53,24 @@ + + mail.activity.template.view.form + mail.activity.template + +
+ + + + + + + + +
+
+
+ + Activity plans mail.activity.plan