audrius/contract
1
0
Fork 1
mirror of https://github.com/OCA/contract.git synced 2025-02-13 17:57:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #702 into 12.0

Browse Source 
Signed-off-by sbejaoui
This commit is contained in:
OCA-git-bot
2021-07-23 07:51:59 +00:00
parent efceaf8706 5b3dd5cdb0
commit 3c84933721
2 changed files with 79 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
contract/models/contract.py
View File

@@ -70,6 +70,9 @@ class ContractContract(models.Model):
date_end = fields.Date(
compute='_compute_date_end', string='Date End', store=True
)
date_start = fields.Date(
compute='_compute_date_end', string='Date Start', store=True
)
payment_term_id = fields.Many2one(
comodel_name='account.payment.term', string='Payment Terms', index=True
)
@@ -299,6 +302,10 @@ class ContractContract(models.Model):
date_end = contract.contract_line_ids.mapped('date_end')
if date_end and all(date_end):
contract.date_end = max(date_end)
date_start = False
if contract.contract_line_ids:
date_start = min(contract.contract_line_ids.mapped('date_start'))
contract.date_start = date_start
@api.depends(
'contract_line_ids.recurring_next_date',

75
contract/views/contract.xml
View File

@@ -322,13 +322,82 @@
</search>
</field>
</record>
<record id="view_contract_contract_calendar" model="ir.ui.view">
<field name="name">contract.contract.calendar</field>
<field name="model">contract.contract</field>
<field name="arch" type="xml">
<calendar string="Contracts" date_start="date_start" color="is_terminated">
<field name="name" />
<field name="partner_id" />
</calendar>
</field>
</record>
<record id="view_contract_contract_graph" model="ir.ui.view">
<field name="name">contract.contract.graph</field>
<field name="model">contract.contract</field>
<field name="arch" type="xml">
<graph string="Contracts">
<field name="date_start" />
</graph>
</field>
</record>
<record id="view_contract_contract_pivot" model="ir.ui.view">
<field name="name">contract.contract.pivot</field>
<field name="model">contract.contract</field>
<field name="arch" type="xml">
<pivot string="Contracts">
<field name="date_start" type="row" />
</pivot>
</field>
</record>
<record id="view_contract_contract_kanban" model="ir.ui.view">
<field name="name">contract.contract.kanban</field>
<field name="model">contract.contract</field>
<field name="arch" type="xml">
<kanban class="o_kanban_mobile">
<field name="name" />
<field name="partner_id" />
<field name="date_end" />
<templates>
<t t-name="kanban-box">
<div t-attf-class="oe_kanban_card oe_kanban_global_click">
<div class="o_kanban_record_top mb16">
<div class="o_kanban_record_headings mt4">
<strong class="o_kanban_record_title">
<span>
<t t-esc="record.partner_id.value" />
</span>
</strong>
</div>
</div>
<div class="o_kanban_record_bottom">
<div class="oe_kanban_bottom_left text-muted">
<span>
<t t-esc="record.name.value" />
<t t-esc="record.date_end.value" />
</span>
</div>
<div class="oe_kanban_bottom_right">
<div class="float-right">
<field
name="activity_ids"
widget="kanban_activity"
/>
</div>
</div>
</div>
</div>
</t>
</templates>
</kanban>
</field>
</record>
<!--ACTION customer contracts-->
<record id="action_customer_contract" model="ir.actions.act_window">
<field name="name">Customer Contracts</field>
<field name="res_model">contract.contract</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_mode">tree,kanban,form,calendar,pivot,graph,activity</field>
<field name="domain">[('contract_type', '=', 'sale')]</field>
<field name="context">{'is_contract':1,
'search_default_not_finished':1,
@@ -367,7 +436,7 @@
<field name="name">Supplier Contracts</field>
<field name="res_model">contract.contract</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_mode">tree,kanban,form,calendar,pivot,graph,activity</field>
<field name="domain">[('contract_type', '=', 'purchase')]</field>
<field name="context">{'is_contract':1,
'search_default_not_finished':1,