[IMP]mail_activity_plan:use mail.activity.type default_description as activity.template default note
This commit is contained in:
@@ -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
|
||||
|
@@ -53,6 +53,24 @@
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="mail_activity_template_view_form" model="ir.ui.view">
|
||||
<field name="name">mail.activity.template.view.form</field>
|
||||
<field name="model">mail.activity.template</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Activity">
|
||||
<sheet>
|
||||
<group>
|
||||
<field name="mail_activity_type_id"/>
|
||||
<field name="summary"/>
|
||||
<field name="user_id"/>
|
||||
<field name="note"/>
|
||||
</group>
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="mail_activity_plan_action" model="ir.actions.act_window">
|
||||
<field name="name">Activity plans</field>
|
||||
<field name="res_model">mail.activity.plan</field>
|
||||
|
Reference in New Issue
Block a user