Merge PR #729 into 13.0

Signed-off-by AaronHForgeFlow
This commit is contained in:
OCA-git-bot
2021-11-19 08:57:20 +00:00

View File

@@ -404,6 +404,11 @@
<kanban default_group_by="stage_id"> <kanban default_group_by="stage_id">
<field name="color" /> <field name="color" />
<field name="assigned_user_id" /> <field name="assigned_user_id" />
<field name="activity_state" />
<progressbar
field="activity_state"
colors='{"planned": "success", "today": "warning", "overdue": "danger"}'
/>
<templates> <templates>
<t t-name="kanban-box"> <t t-name="kanban-box">
<div <div
@@ -489,6 +494,10 @@
class="oe_kanban_avatar" class="oe_kanban_avatar"
alt="user &amp; picture" alt="user &amp; picture"
/> />
<field
name="activity_ids"
widget="kanban_activity"
/>
</div> </div>
</div> </div>
</div> </div>
@@ -510,21 +519,35 @@
<field name="partner_id" /> <field name="partner_id" />
<field name="agreement_type_id" /> <field name="agreement_type_id" />
<field name="agreement_subtype_id" /> <field name="agreement_subtype_id" />
<filter
name="filter_inactive"
string="Archived"
domain="[('active','=',False)]"
/>
<separator />
<filter <filter
name="filter_non_template" name="filter_non_template"
string="Non-Templates" string="Non-Templates"
domain="[('active','=',True),('is_template', '=', False)]" domain="[('active','=',True),('is_template', '=', False)]"
/> />
<filter
name="filter_inactive"
string="Archived"
domain="[('active','=',False)]"
/>
<filter <filter
name="filter_templates" name="filter_templates"
string="Templates" string="Templates"
domain="[('active','=',True),('is_template', '=', True)]" domain="[('active','=',True),('is_template', '=', True)]"
/> />
<separator />
<filter
name="activities_overdue"
string="Late Activities"
domain="[('activity_ids.date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
help="Show all activities which deadline is before today"
/>
<filter
name="activities_overdue"
string="Active Activities"
domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))]"
help="Show all activities which deadline is after today"
/>
<filter <filter
name="group_partner_id" name="group_partner_id"
string="Partners" string="Partners"
@@ -552,6 +575,34 @@
</search> </search>
</field> </field>
</record> </record>
<!-- Agreement Activity -->
<record id="agreement_view_activity" model="ir.ui.view">
<field name="name">agreement.activity</field>
<field name="model">agreement</field>
<field name="arch" type="xml">
<activity string="Agreements">
<field name="id" />
<templates>
<div t-name="activity-box">
<img
t-att-src="activity_image('res.partner', 'image_128', record.id.raw_value)"
role="img"
t-att-title="record.id.value"
t-att-alt="record.id.value"
/>
<div>
<field name="name" display="full" />
<field
name="parent_agreement_id"
muted="1"
display="full"
/>
</div>
</div>
</templates>
</activity>
</field>
</record>
<!-- Agreement Reporting --> <!-- Agreement Reporting -->
<record id="agreement_graph_view" model="ir.ui.view"> <record id="agreement_graph_view" model="ir.ui.view">
<field name="name">agreement.graph</field> <field name="name">agreement.graph</field>
@@ -582,20 +633,20 @@
<field name="res_model">agreement</field> <field name="res_model">agreement</field>
<field name="domain">[('is_template', '=', False)]</field> <field name="domain">[('is_template', '=', False)]</field>
<field name="context">{'default_is_template': False}</field> <field name="context">{'default_is_template': False}</field>
<field name="view_mode">kanban,tree,form</field> <field name="view_mode">kanban,tree,form,activity</field>
</record> </record>
<record model="ir.actions.act_window" id="agreement_operations_agreement"> <record model="ir.actions.act_window" id="agreement_operations_agreement">
<field name="name">Agreements</field> <field name="name">Agreements</field>
<field name="res_model">agreement</field> <field name="res_model">agreement</field>
<field name="domain">[('is_template', '=', False)]</field> <field name="domain">[('is_template', '=', False)]</field>
<field name="context">{'default_is_template': False}</field> <field name="context">{'default_is_template': False}</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form,activity</field>
</record> </record>
<record model="ir.actions.act_window" id="partner_agreement_agreement_templates"> <record model="ir.actions.act_window" id="partner_agreement_agreement_templates">
<field name="name">Templates</field> <field name="name">Templates</field>
<field name="res_model">agreement</field> <field name="res_model">agreement</field>
<field name="domain">[('is_template', '=', True)]</field> <field name="domain">[('is_template', '=', True)]</field>
<field name="context">{'default_is_template': True}</field> <field name="context">{'default_is_template': True}</field>
<field name="view_mode">tree,kanban,form</field> <field name="view_mode">tree,kanban,form,activity</field>
</record> </record>
</odoo> </odoo>