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

[IMP] - Simplify sale order line creation for contract product

Browse Source
This commit is contained in:
sbejaoui
2019-01-21 19:02:48 +01:00
committed by Adasat
parent 4d4e1c4fb3
commit 2010e9bf36
7 changed files with 59 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
product_contract/views/product_template.xml
View File

@@ -29,30 +29,16 @@
</group>
<group name="recurrence_info">
<group>
<label for="recurring_interval"/>
<div>
<field name="recurring_interval"
class="oe_inline" nolabel="1"/>
<field name="recurring_rule_type"
class="oe_inline" nolabel="1"/>
</div>
<field name="recurring_rule_type"/>
</group>
<group>
<field name="default_qty"/>
<field name="recurring_invoicing_type"
attrs="{'invisible': [('recurring_rule_type', '=', 'monthlylastday')]}"/>
</group>
</group>
<group>
<field name="is_auto_renew"/>
<label for="auto_renew_interval" attrs="{'invisible': [('is_auto_renew', '=', False)],
'required':[('is_contract', '=', True)]}"/>
<div attrs="{'invisible': [('is_auto_renew', '=', False)],
'required':[('is_auto_renew', '=', True)]}">
<field name="auto_renew_interval"
class="oe_inline" nolabel="1"/>
<field name="auto_renew_rule_type"
class="oe_inline" nolabel="1"/>
</div>
<label for="termination_notice_interval" attrs="{'invisible': [('is_auto_renew', '=', False)],
'required':[('is_contract', '=', True)]}"/>
<div attrs="{'invisible': [('is_auto_renew', '=', False)],

14
product_contract/views/sale_order.xml
View File

@@ -34,8 +34,7 @@
<field name="contract_line_id"
attrs="{'invisible': [('is_contract', '=', False)]}"
domain="[('contract_id','=',contract_id)]"/>
<field name="is_auto_renew"
invisible="1"/>
</xpath>
<xpath expr="//field[@name='order_line']/form//field[@name='tax_id']/parent::group"
@@ -45,13 +44,7 @@
attrs="{'invisible': [('is_contract', '=', False)]}"/>
<group attrs="{'invisible': [('is_contract', '=', False)]}">
<label for="recurring_interval"/>
<div>
<field name="recurring_interval"
class="oe_inline" nolabel="1"/>
<field name="recurring_rule_type"
class="oe_inline" nolabel="1"/>
</div>
<field name="recurring_rule_type"/>
</group>
<group attrs="{'invisible': [('is_contract', '=', False)]}">
<field name="recurring_invoicing_type"
@@ -62,8 +55,7 @@
attrs="{'required': [('is_contract', '=', True)]}"/>
</group>
<group attrs="{'invisible': [('is_contract', '=', False)]}">
<field name="date_end"
attrs="{'required': [('is_auto_renew', '=', True)]}"/>
<field name="date_end" required="True"/>
</group>
</xpath>
<xpath expr="//field[@name='order_line']/tree//field[@name='price_total']"