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

[16.0][IMP] contract and contract_variable_quantity: improve visual of contract lines

Browse Source
This commit is contained in:
Alicia Garzo Moreno
2024-04-01 18:52:06 +02:00
parent 25a70bb1cd
commit de15e11539
2 changed files with 14 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
contract/views/abstract_contract_line.xml
View File

@@ -16,65 +16,30 @@
<field colspan="1" name="product_uom_category_id" invisible="1" /> <field colspan="1" name="product_uom_category_id" invisible="1" />
<group> <group>
<field <field
colspan="1"
name="product_id" name="product_id"
attrs="{'required': [('display_type', '=', 'product')],'invisible': [('display_type', '!=', False)]}" attrs="{'required': [('display_type', '=', 'product')],'invisible': [('display_type', '!=', False)]}"
/> />
</group> </group>
<group <group attrs="{'invisible': [('display_type', '!=', False)]}">
col="2" <group>
attrs="{'invisible': [('display_type', '!=', False)]}" <field name="automatic_price" />
>
<group colspan="1">
<label for="automatic_price" colspan="2" />
<field colspan="2" name="automatic_price" nolabel="1" />
</group>
<group colspan="1">
<label for="price_unit" colspan="2" />
<field <field
colspan="2"
name="price_unit" name="price_unit"
attrs="{'readonly': [('automatic_price', '=', True)]}" attrs="{'readonly': [('automatic_price', '=', True)]}"
nolabel="1"
/> />
<field name="quantity" />
</group> </group>
<group colspan="1"> <group>
<label for="quantity" colspan="2" />
<field <field
colspan="2"
name="quantity"
class="oe_inline"
nolabel="1"
/>
</group>
<group colspan="1">
<label for="uom_id" colspan="2" />
<field
colspan="2"
name="uom_id" name="uom_id"
class="oe_inline"
groups="uom.group_uom" groups="uom.group_uom"
attrs="{'required': [('display_type', '=', False)]}" attrs="{'required': [('display_type', '=', False)]}"
nolabel="1"
/> />
</group>
<group colspan="1">
<label for="discount" colspan="2" />
<field <field
colspan="2"
name="discount" name="discount"
groups="product.group_discount_per_so_line" groups="product.group_discount_per_so_line"
nolabel="1"
/>
</group>
<group colspan="1">
<label for="price_subtotal" colspan="2" />
<field
colspan="2"
name="price_subtotal"
readonly="1"
nolabel="1"
/> />
<field name="price_subtotal" readonly="1" />
</group> </group>
</group> </group>
<label <label
@@ -99,46 +64,37 @@
> >
<field name="note_invoicing_mode" widget="radio" /> <field name="note_invoicing_mode" widget="radio" />
</group> </group>
<group <group attrs="{'invisible': [('display_type', '!=', False)]}">
col="4" <field name="is_auto_renew" />
attrs="{'invisible': [('display_type', '!=', False)]}" <field name="is_canceled" invisible="1" />
>
<field colspan="2" name="is_auto_renew" />
<field colspan="2" name="is_canceled" invisible="1" />
</group> </group>
<group <group
attrs="{'invisible':['|', ('is_auto_renew', '=', False), ('display_type', '!=', False)]}" attrs="{'invisible':['|', ('is_auto_renew', '=', False), ('display_type', '!=', False)]}"
> >
<group> <group>
<label for="auto_renew_interval" /> <label for="auto_renew_interval" />
<div> <div class="o_row">
<field <field
name="auto_renew_interval" name="auto_renew_interval"
class="oe_inline"
nolabel="1"
attrs="{'required':[('is_auto_renew', '=', True)]}" attrs="{'required':[('is_auto_renew', '=', True)]}"
/> />
<field <field
name="auto_renew_rule_type" name="auto_renew_rule_type"
class="oe_inline"
nolabel="1"
attrs="{'required':[('is_auto_renew', '=', True)]}" attrs="{'required':[('is_auto_renew', '=', True)]}"
/> />
</div> </div>
</group> </group>
<group> <group>
<label for="termination_notice_interval" /> <label for="termination_notice_interval" />
<div> <div class="o_row">
<field <field
name="termination_notice_interval" name="termination_notice_interval"
class="oe_inline" class="oe_inline"
nolabel="1"
attrs="{'required':[('is_auto_renew', '=', True)]}" attrs="{'required':[('is_auto_renew', '=', True)]}"
/> />
<field <field
name="termination_notice_rule_type" name="termination_notice_rule_type"
class="oe_inline" class="oe_inline"
nolabel="1"
attrs="{'required':[('is_auto_renew', '=', True)]}" attrs="{'required':[('is_auto_renew', '=', True)]}"
/> />
</div> </div>
@@ -151,19 +107,9 @@
<group> <group>
<label for="recurring_interval" /> <label for="recurring_interval" />
<div class="o_row"> <div class="o_row">
<field <field name="recurring_interval" />
name="recurring_interval" <field name="recurring_rule_type" />
class="oe_inline"
nolabel="1"
/>
<field
name="recurring_rule_type"
class="oe_inline"
nolabel="1"
/>
</div> </div>
</group>
<group>
<field name="recurring_invoicing_type" /> <field name="recurring_invoicing_type" />
<field name="recurring_invoicing_offset" /> <field name="recurring_invoicing_offset" />
</group> </group>

2
contract_variable_quantity/views/abstract_contract_line.xml
View File

@@ -8,7 +8,7 @@
ref="contract.contract_abstract_contract_line_form_view" ref="contract.contract_abstract_contract_line_form_view"
/> />
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//label[@for='quantity']" position="before"> <xpath expr="//field[@name='quantity']" position="before">
<field name="qty_type" /> <field name="qty_type" />
</xpath> </xpath>
<xpath expr="//field[@name='quantity']" position="after"> <xpath expr="//field[@name='quantity']" position="after">