[MERGE]:lp:~openerp-dev/openobject-addons/trunk-form-add-topbar-apa-bank_statement-mma

bzr revid: apa@tinyerp.com-20120507133002-70otqnlxcaimttp0
This commit is contained in:
Amit Patel (OpenERP) 2012-05-07 19:00:02 +05:30
commit 3d7caa7535
1 changed files with 2 additions and 2 deletions

View File

@ -234,7 +234,7 @@
<field name="model">stock.picking</field>
<field name="inherit_id" ref="stock.view_picking_out_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>
@ -316,7 +316,7 @@
<field name="model">stock.picking</field>
<field name="inherit_id" ref="stock.view_picking_out_form"/>
<field name="arch" type="xml">
<xpath expr="/form/sheet/notebook/page[@string='Products']/group/button[@string='Create Invoice']" position="after">
<xpath expr="/form/div/button[@string='Create Invoice']" position="after">
<button name="%(report_shipping)d" string="Delivery Order" states="done" type="action" icon="gtk-print"/>
</xpath>
</field>