reset

This reverts commit a0d1b6e854.

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",

mail_activity_plan/models/mail_activity_plan.py

@@ -9,7 +9,7 @@ class MailActivityTemplate(models.Model):
     '''
     _name = 'mail.activity.template'
     _description = 'Mail activity template'
-    _order = 'sequence'
+    _order = 'sequence'    
 
     mail_activity_plan_id = fields.Many2one('mail.activity.plan', ondelete='restrict')
 
@@ -20,16 +20,10 @@ 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)
+    summary = fields.Char('Summary')
     user_id = fields.Many2one('res.users', string='Assigned to')
     note = fields.Html('Note')
 
-    @api.depends('mail_activity_type_id')
-    def _compute_default_summary(self):
-        for mail_activity_template in self:
-            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
-
 class MailActivityPlan(models.Model):
     '''
     Create a plan

mail_activity_plan/views/mail_activity_plan_view.xml

@@ -39,7 +39,7 @@
                         </div>
                         <group string="Activity Templates">
                             <field name="active" invisible="1"/>
-                            <field name="mail_activity_template_ids" nolabel="1">
+                            <field name="mail_activity_template_ids" nolabel="1" colspan="2">
                                 <tree>
                                     <field name="sequence" widget="handle"/>
                                     <field name="mail_activity_type_id"/>
@@ -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>