mirror of
https://github.com/OCA/contract.git
synced 2025-02-13 17:57:24 +02:00
[FIX] product_contract: Compute date_start and date_end correctly. Make fields computed
This commit is contained in:
committed by
Carlos Roca
parent
f7223188d9
commit
0ae4fab56d
@@ -62,19 +62,30 @@
|
||||
invisible="not is_contract"
|
||||
/>
|
||||
<group invisible="not is_contract">
|
||||
<field name="recurring_rule_type" />
|
||||
<label for="recurring_interval" />
|
||||
<div class="o_row">
|
||||
<field
|
||||
name="recurring_interval"
|
||||
readonly="product_uom_readonly"
|
||||
/>
|
||||
<field name="recurring_rule_type" />
|
||||
</div>
|
||||
</group>
|
||||
<group invisible="not is_contract">
|
||||
<field name="recurring_invoicing_type" />
|
||||
</group>
|
||||
<group invisible="not is_contract">
|
||||
<field name="date_start" required="is_contract" />
|
||||
<field
|
||||
name="date_start"
|
||||
required="is_contract"
|
||||
readonly="product_uom_readonly"
|
||||
/>
|
||||
</group>
|
||||
<group invisible="not is_contract">
|
||||
<field name="date_end" />
|
||||
<field name="date_end" readonly="product_uom_readonly" />
|
||||
</group>
|
||||
<group invisible="not is_contract">
|
||||
<field name="is_auto_renew" />
|
||||
<field name="is_auto_renew" readonly="product_uom_readonly" />
|
||||
</group>
|
||||
<group invisible="not is_auto_renew">
|
||||
<label for="auto_renew_interval" />
|
||||
@@ -84,12 +95,14 @@
|
||||
class="oe_inline"
|
||||
nolabel="1"
|
||||
required="is_auto_renew"
|
||||
readonly="product_uom_readonly"
|
||||
/>
|
||||
<field
|
||||
name="auto_renew_rule_type"
|
||||
class="oe_inline"
|
||||
nolabel="1"
|
||||
required="is_auto_renew"
|
||||
readonly="product_uom_readonly"
|
||||
/>
|
||||
</div>
|
||||
</group>
|
||||
@@ -113,6 +126,11 @@
|
||||
domain="[('contract_id','=',contract_id)]"
|
||||
optional="hide"
|
||||
/>
|
||||
<field
|
||||
name="recurring_interval"
|
||||
optional="hide"
|
||||
readonly="product_uom_readonly"
|
||||
/>
|
||||
<field name="recurring_rule_type" optional="hide" />
|
||||
<field name="recurring_invoicing_type" optional="hide" />
|
||||
<field name="contract_start_date_method" column_invisible="1" />
|
||||
@@ -120,15 +138,25 @@
|
||||
name="date_start"
|
||||
optional="hide"
|
||||
required="is_contract and contract_start_date_method == 'manual'"
|
||||
readonly="product_uom_readonly"
|
||||
/>
|
||||
<field
|
||||
name="date_end"
|
||||
optional="hide"
|
||||
readonly="product_uom_readonly"
|
||||
/>
|
||||
<field
|
||||
name="is_auto_renew"
|
||||
optional="hide"
|
||||
readonly="product_uom_readonly"
|
||||
/>
|
||||
<field name="date_end" optional="hide" />
|
||||
<field name="is_auto_renew" optional="hide" />
|
||||
<field
|
||||
name="auto_renew_interval"
|
||||
class="oe_inline"
|
||||
nolabel="1"
|
||||
required="is_auto_renew"
|
||||
optional="hide"
|
||||
readonly="product_uom_readonly"
|
||||
/>
|
||||
<field
|
||||
name="auto_renew_rule_type"
|
||||
@@ -136,6 +164,7 @@
|
||||
nolabel="1"
|
||||
required="is_auto_renew"
|
||||
optional="hide"
|
||||
readonly="product_uom_readonly"
|
||||
/>
|
||||
</xpath>
|
||||
</field>
|
||||
|
||||
Reference in New Issue
Block a user