Elabore/ux-tools
8
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Compare commits

merge into: Elabore:16.0
Branches Tags
Elabore:16.0 Elabore:16.0_pr_manage_copy_of_mail_activity_plan Elabore:14.0
...
pull from: Elabore:14.0
Branches Tags
Elabore:16.0 Elabore:16.0_pr_manage_copy_of_mail_activity_plan Elabore:14.0

6 Commits
16.0 ... 14.0

Author SHA1 Message Date
clementthomas
c0f1d40d67 reset 2024-03-04 09:37:42 +01:00
clementthomas
3dec6478d7 Revert "[FIX] mail_activity_plan:" 
This reverts commit a0d1b6e854.
 2024-03-04 09:34:39 +01:00
clementthomas
b6b80516ba manage copy of mail activity plan 2024-03-04 09:28:56 +01:00
clementthomas
a0d1b6e854 [FIX] mail_activity_plan: 
Better display of activities in plan
 2023-12-11 10:32:52 +01:00
Laetitia Da Costa
8a3b55035d [REM]mail_activity_plan:remove compute fonction in summary and note 2023-10-17 16:51:54 +02:00
Laetitia Da Costa
ba60a0be89 [IMP]mail_activity_plan:use mail.activity.type default_description as activity.template default note 2023-10-17 11:47:59 +02:00
3 changed files with 22 additions and 10 deletions
Expand all files Collapse all files

2
mail_activity_plan/__manifest__.py
View File

@@ -3,7 +3,7 @@
{ {
"name": "mail_activity_plan", "name": "mail_activity_plan",
"version": "14.0.1.0.0", "version": "14.0.1.1.0",
"author": "Elabore", "author": "Elabore",
"website": "https://github.com/elabore-coop/ux-tools", "website": "https://github.com/elabore-coop/ux-tools",
"maintainer": "Laetitia Da Costa", "maintainer": "Laetitia Da Costa",

8
mail_activity_plan/models/mail_activity_plan.py
View File

@@ -20,16 +20,10 @@ class MailActivityTemplate(models.Model):
) )
sequence = fields.Integer('Sequence', default=1, help="Used to order activities.") 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') user_id = fields.Many2one('res.users', string='Assigned to')
note = fields.Html('Note') 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): class MailActivityPlan(models.Model):
''' '''
Create a plan Create a plan

20
mail_activity_plan/views/mail_activity_plan_view.xml
View File

@@ -39,7 +39,7 @@
</div> </div>
<group string="Activity Templates"> <group string="Activity Templates">
<field name="active" invisible="1"/> <field name="active" invisible="1"/>
<field name="mail_activity_template_ids" nolabel="1"> <field name="mail_activity_template_ids" nolabel="1" colspan="2">
<tree> <tree>
<field name="sequence" widget="handle"/> <field name="sequence" widget="handle"/>
<field name="mail_activity_type_id"/> <field name="mail_activity_type_id"/>
@@ -53,6 +53,24 @@
</field> </field>
</record> </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"> <record id="mail_activity_plan_action" model="ir.actions.act_window">
<field name="name">Activity plans</field> <field name="name">Activity plans</field>
<field name="res_model">mail.activity.plan</field> <field name="res_model">mail.activity.plan</field>