pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] stock.move: make form views more consistent

Browse Source 
bzr revid: odo@openerp.com-20100901082225-uwdp8er9sujtxt87
This commit is contained in:
Olivier Dony
2010-09-01 10:22:25 +02:00
parent a47b49e672
commit fecc196115
1 changed files with 108 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/stock/stock_view.xml
+108 -101
View File
@@ -834,7 +834,7 @@
<button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
<button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
<button name="%(action_partial_picking)d" states="assigned" string="Products Sent" type="action" icon="gtk-go-forward"/>
<button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" type="action" icon="terp-document-new" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
<button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" type="action" icon="terp-document-new" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
<button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
</group>
</page>
@@ -1382,68 +1382,63 @@
<field eval="4" name="priority"/>
<field name="arch" type="xml">
<form string="Stock Moves">
<notebook colspan="4">
<page string="General Information">
<group colspan="2" col="2">
<separator colspan="2" string="Move Information"/>
<field name="name"/>
<field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.address_id)"/>
<field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
<field name="product_uom" string="Unit Of Measure" widget="selection"/>
<field name="product_uos_qty" groups="product.product_uos" />
<field name="product_uos" groups="product.product_uos" />
</group>
<group colspan="2" col="2">
<separator colspan="2" string="Move Information"/>
<field name="name"/>
<field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.address_id)"/>
<field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
<field name="product_uom" string="Unit Of Measure" widget="selection"/>
<field name="product_uos_qty" groups="product.product_uos" />
<field name="product_uos" groups="product.product_uos" />
</group>
<group colspan="2" col="2">
<separator string="Locations &amp; Picking" colspan="2" />
<field name="location_id" widget="selection"/>
<field name="location_dest_id" widget="selection"/>
<field name="picking_id"/>
<field name="address_id" context="{'contact_display':'partner'}"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
<group colspan="2" col="2">
<separator string="Locations &amp; Picking" colspan="2" />
<field name="location_id" widget="selection"/>
<field name="location_dest_id" widget="selection"/>
<field name="picking_id"/>
<field name="address_id" context="{'contact_display':'partner'}"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
<group colspan="2" col="2">
<separator string="Dates &amp; Priority" colspan="2" />
<field name="date"/>
<field name="date_planned"/>
<field name="date_expected"/>
<field name="priority"/>
</group>
<group colspan="2" col="2">
<separator string="Dates &amp; Priority" colspan="2" />
<field name="date"/>
<field name="date_planned"/>
<field name="date_expected"/>
<field name="priority"/>
</group>
<group colspan="2" col="4">
<separator string="Traceability" colspan="4" />
<field name="tracking_id" colspan="4" />
<field name="prodlot_id" groups="base.group_extended"
context="{'location_id':location_id, 'product_id':product_id}"
domain="[('product_id','=?',product_id)]"
on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
<newline/>
<group colspan="4" col="4">
<label/>
<button name="%(track_line)d"
groups="base.group_extended"
states="draft,waiting,confirmed,assigned,done"
string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize" colspan="2" />
<label/>
<button name="%(split_into)d" string="Put in a new pack" type="action"
groups="base.group_extended"
icon="terp-stock_effects-object-colorize"
states="draft,assigned,confirmed,done"/>
<button name="%(stock.move_scrap)d"
string="Scrap Products" type="action"
icon="gtk-convert" context="{'scrap': True}"
states="draft,waiting,confirmed,assigned" />
</group>
</group>
</page>
</notebook>
<group colspan="2" col="4">
<separator string="Traceability" colspan="4" />
<field name="tracking_id" colspan="4" />
<field name="prodlot_id" groups="base.group_extended"
context="{'location_id':location_id, 'product_id':product_id}"
domain="[('product_id','=?',product_id)]"
on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
<newline/>
<group colspan="4" col="4">
<button name="%(track_line)d"
groups="base.group_extended"
states="draft,waiting,confirmed,assigned,done"
string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize" colspan="2" />
<button name="%(split_into)d" string="Put in a new pack" type="action"
groups="base.group_extended"
icon="terp-stock_effects-object-colorize"
states="draft,assigned,confirmed,done"/>
<button name="%(stock.move_scrap)d"
string="Scrap Products" type="action"
icon="gtk-convert" context="{'scrap': True}"
states="draft,waiting,confirmed,assigned" />
</group>
</group>
<separator colspan="4"/>
<group col="6" colspan="4">
<field name="state"/>
<button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
<button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
<button name="action_cancel" states="assigned,confirmed" string="Cancel" type="object" icon="gtk-cancel"/>
<button name="action_done" states="assigned" string="Make Parcel" type="object" icon="gtk-jump-to"/>
<button name="action_done" states="assigned" string="Done" type="object" icon="gtk-jump-to"/>
</group>
</form>
</field>
@@ -1547,53 +1542,65 @@
<field eval="6" name="priority"/>
<field name="arch" type="xml">
<form string="Moves">
<notebook colspan="4">
<page string="General Information">
<separator colspan="4" string="Move Information"/>
<field name="location_id" widget="selection"/>
<field name="location_dest_id" widget="selection"/>
<field colspan="4" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id, address_id)"/>
<field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
<field name="product_uom" widget="selection"/>
<field name="product_uos_qty" groups="product.product_uos"/>
<field name="product_uos" widget="selection" groups="product.product_uos"/>
<field colspan="4" name="name"/>
<field name="date"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<field name="date_planned"/>
<field name="date_expected"/>
<field name="priority"/>
<field name="address_id" context="{'contact_display':'partner'}"/>
<field name="picking_id"/>
<newline/>
<field name="prodlot_id" groups="base.group_extended"
context="{'location_id':location_id, 'product_id':product_id}"
domain="[('product_id','=?',product_id)]"
on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
<field groups="base.group_extended" name="tracking_id"/>
<newline/>
<label/>
<button name="%(track_line)d" string="Split in production lots"
states="draft,waiting,confirmed,assigned,done"
<group colspan="2" col="2">
<separator colspan="2" string="Move Information"/>
<field name="name"/>
<field name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id, address_id)"/>
<field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
<field name="product_uom" string="Unit Of Measure" widget="selection"/>
<field name="product_uos_qty" groups="product.product_uos" />
<field name="product_uos" widget="selection" groups="product.product_uos"/>
</group>
<group colspan="2" col="2">
<separator string="Locations &amp; Picking" colspan="2" />
<field name="location_id" widget="selection"/>
<field name="location_dest_id" widget="selection"/>
<field name="picking_id"/>
<field name="address_id" context="{'contact_display':'partner'}"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
<group colspan="2" col="2">
<separator string="Dates &amp; Priority" colspan="2" />
<field name="date"/>
<field name="date_planned"/>
<field name="date_expected"/>
<field name="priority"/>
</group>
<group colspan="2" col="4">
<separator string="Traceability" colspan="4" />
<field name="tracking_id" colspan="4" />
<field name="prodlot_id" groups="base.group_extended"
context="{'location_id':location_id, 'product_id':product_id}"
domain="[('product_id','=?',product_id)]"
on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
<newline/>
<group colspan="4" col="4">
<button name="%(track_line)d"
groups="base.group_extended"
type="action" icon="terp-stock_effects-object-colorize"/>
<label/>
<button name="%(split_into)d" string="Put in a new pack" type="action"
groups="base.group_extended"
icon="terp-stock_effects-object-colorize"
states="draft,assigned,confirmed,done"/>
<label/>
<separator colspan="4" string="Move State"/>
<field name="state"/>
<group col="5" colspan="2">
<button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
<button name="action_cancel" states="assigned,confirmed" string="Cancel" type="object" icon="gtk-cancel"/>
<button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
<button name="%(action_partial_move)d" states="assigned,confirmed" string="Partial" type="action" icon="gtk-justify-fill"/>
<button name="action_done" states="assigned" string="Done" type="object" icon="gtk-jump-to"/>
</group>
</page>
</notebook>
states="draft,waiting,confirmed,assigned,done"
string="Split in production lots" type="action" icon="terp-stock_effects-object-colorize" colspan="2" />
<button name="%(split_into)d" string="Put in a new pack" type="action"
groups="base.group_extended"
icon="terp-stock_effects-object-colorize"
states="draft,assigned,confirmed,done"/>
<button name="%(stock.move_scrap)d"
string="Scrap Products" type="action"
icon="gtk-convert" context="{'scrap': True}"
states="draft,waiting,confirmed,assigned" />
</group>
</group>
<separator colspan="4"/>
<group col="6" colspan="4">
<field name="state"/>
<button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
<button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
<button name="action_cancel" states="assigned,confirmed" string="Cancel" type="object" icon="gtk-cancel"/>
<button name="%(action_partial_move)d" states="assigned,confirmed" string="Partial" type="action" icon="gtk-justify-fill"/>
<button name="action_done" states="assigned" string="Done" type="object" icon="gtk-jump-to"/>
</group>
</form>
</field>
</record>