[Merge] Merge the Purchase section.

bzr revid: mdi@tinyerp.com-20121121095654-3iqoqz1lhx4awh7s
This commit is contained in:
Divyesh Makwana (Open ERP)
2012-11-21 15:26:54 +05:30
+14 -2
View File
@@ -261,8 +261,8 @@
<field name="search_view_id" ref="stock.view_picking_out_search"/>
</record>
<record id="view_picking_withweight_internal_move_form" model="ir.ui.view">
<field name="name">stock.picking_withweight.internal.move.form.view</field>
<record id="view_picking_withweight_internal_move_tree" model="ir.ui.view">
<field name="name">stock.picking_withweight.internal.move.tree.view</field>
<field name="model">stock.move</field>
<field name="inherit_id" ref="stock.view_move_picking_tree"/>
<field name="arch" type="xml">
@@ -273,6 +273,18 @@
</field>
</record>
<record id="view_picking_withweight_internal_move_form" model="ir.ui.view">
<field name="name">stock.picking_withweight.internal.move.form.view</field>
<field name="model">stock.move</field>
<field name="inherit_id" ref="stock.view_move_picking_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='date_expected']" position="after">
<field name="weight"/>
<field name="weight_net" groups="base.group_no_one"/>
</xpath>
</field>
</record>
<record id="view_move_withweight_form" model="ir.ui.view">
<field name="name">stock.move.form.weight</field>
<field name="model">stock.move</field>