[MERGE]:lp:~openerp-dev/openobject-addons/trunk-fix-topbar-tpa

bzr revid: apa@tinyerp.com-20120427084151-3rv8nt58y9y99hmo
This commit is contained in:
Amit Patel (OpenERP) 2012-04-27 14:11:51 +05:30
commit 7e9d2f47f0
3 changed files with 4 additions and 4 deletions

View File

@ -247,7 +247,7 @@
<field name="model">stock.picking</field>
<field name="inherit_id" ref="stock.view_picking_in_form"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
<xpath expr="/form/sheet/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
<field name="weight"/>
<field name="weight_net"/>
</xpath>
@ -260,7 +260,7 @@
<field name="model">stock.picking</field>
<field name="inherit_id" ref="stock.view_picking_form"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
<xpath expr="/form/sheet/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
<field name="weight"/>
<field name="weight_net"/>
</xpath>

View File

@ -7,7 +7,7 @@
<field name="type">form</field>
<field name="inherit_id" ref="stock.view_move_form"/>
<field name="arch" type="xml">
<xpath expr="/form/group/field[@name='tracking_id']" position="before">
<xpath expr="/form/sheet/group/field[@name='tracking_id']" position="before">
<field name="purchase_line_id" colspan="2" />
</xpath>
</field>

View File

@ -19,7 +19,7 @@
<field name="type">form</field>
<field name="inherit_id" ref="stock.view_move_form"/>
<field name="arch" type="xml">
<xpath expr="/form/group/field[@name='tracking_id']" position="before">
<xpath expr="/form/sheet/group/field[@name='tracking_id']" position="before">
<field name="sale_line_id" colspan="2"/>
</xpath>
</field>