[IMP] sale:-reorganise form view for sale order line
bzr revid: mtr@mtr-20100929101557-labb8267ac0k1zkl
This commit is contained in:
parent
3dfbab52e4
commit
4862be9f7b
|
@ -364,6 +364,7 @@ to your configuration: from the sales order, from the pickings, etc.
|
|||
<field name="salesman_id"/>
|
||||
<field name="price_subtotal"/>
|
||||
<field name="state"/>
|
||||
<field name="invoiced"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
@ -373,7 +374,6 @@ to your configuration: from the sales order, from the pickings, etc.
|
|||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Sales Order Lines">
|
||||
<separator colspan="4" string="General Information"/>
|
||||
<group colspan="4" col="6">
|
||||
<field name="order_id"/>
|
||||
<field name="product_id" readonly="1"/>
|
||||
|
@ -381,50 +381,36 @@ to your configuration: from the sales order, from the pickings, etc.
|
|||
<field name="product_uom_qty" readonly="1"/>
|
||||
<field groups="product.group_uos" name="product_uos_qty"/>
|
||||
<field name="product_uom"/>
|
||||
<field colspan="4" name="name" groups="base.group_extended"/>
|
||||
<field name="company_id" groups="base.group_multi_company" readonly="1"/>
|
||||
<field name="order_partner_id" readonly="1" invisible="1"/>
|
||||
</group>
|
||||
<notebook>
|
||||
<page string="Order Lines">
|
||||
<separator colspan="4" string="Manual Designation"/>
|
||||
<group colspan="4" col="6">
|
||||
<field name="type" groups="base.group_extended"/>
|
||||
<field name="delay" groups="base.group_extended"/>
|
||||
<field name="th_weight" groups="base.group_extended"/>
|
||||
<field name="price_unit"/>
|
||||
<field name="discount"/>
|
||||
<field name="price_subtotal"/>
|
||||
</group>
|
||||
<separator colspan="4" string="Description"/>
|
||||
<field colspan="4" name="name" groups="base.group_extended"/>
|
||||
<separator colspan="4" string="Taxes"/>
|
||||
<field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','<>','purchase')]" nolabel="1"/>
|
||||
<separator colspan="4"/>
|
||||
<field name="state"/>
|
||||
<group col="3" colspan="2">
|
||||
<button colspan="1"
|
||||
name="%(action_view_sale_order_line_make_invoice)d"
|
||||
string="Make Invoice"
|
||||
type="action"
|
||||
icon="terp-document-new"
|
||||
attrs="{'invisible': ['|',('state', 'in', ('draft','cancel')),('invoiced', '=', 1)]}"/>
|
||||
<button name="button_cancel"
|
||||
string="Cancel" type="object"
|
||||
icon="gtk-cancel"
|
||||
attrs="{'invisible': ['|',('state', 'not in', ('confirmed', 'exception')),('invoiced', '=', 1)]}"/>
|
||||
<button name="button_done"
|
||||
string="Done" type="object"
|
||||
icon="gtk-jump-to"
|
||||
attrs="{'invisible': ['|',('state', 'not in', ('confirmed','exception')),('invoiced', '=', 0)]}"/>
|
||||
</group>
|
||||
</page>
|
||||
<page string="Invoice Lines" groups="base.group_extended">
|
||||
<field colspan="4" name="invoice_lines" nolabel="1"/>
|
||||
</page>
|
||||
<page string="Notes">
|
||||
<field colspan="4" name="notes" nolabel="1"/>
|
||||
</page>
|
||||
</notebook>
|
||||
<separator colspan="4" string="Price"/>
|
||||
<group colspan="4" col="6">
|
||||
<field name="price_unit"/>
|
||||
<field name="discount"/>
|
||||
<field name="price_subtotal"/>
|
||||
</group>
|
||||
<separator colspan="4" string="Notes"/>
|
||||
<field colspan="4" name="notes" nolabel="1"/>
|
||||
<separator colspan="4"/>
|
||||
<field name="state"/>
|
||||
<group col="3" colspan="2">
|
||||
<!-- <button colspan="1"
|
||||
name="%(action_view_sale_order_line_make_invoice)d"
|
||||
string="Make Invoice"
|
||||
type="action"
|
||||
icon="terp-document-new"
|
||||
attrs="{'invisible': ['|',('state', 'in', ('draft','cancel')),('invoiced', '=', 1)]}"/>-->
|
||||
<button name="button_cancel"
|
||||
string="Cancel" type="object"
|
||||
icon="gtk-cancel"
|
||||
attrs="{'invisible': ['|',('state', 'not in', ('confirmed', 'exception')),('invoiced', '=', 1)]}"/>
|
||||
<button name="button_done"
|
||||
string="Done" type="object"
|
||||
icon="gtk-jump-to"
|
||||
attrs="{'invisible': ['|',('state', 'not in', ('confirmed','exception')),('invoiced', '=', 0)]}"/>
|
||||
</group>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
Loading…
Reference in New Issue