Merge lp:~openerp-dev/openobject-addons/trunk-addons7-bom-field-on-top-tch

bzr revid: jam@tinyerp.com-20120903102639-876nx24p0kr4ku5r
This commit is contained in:
Jigar Amin - OpenERP 2012-09-03 15:56:39 +05:30
commit 6bce067472
1 changed files with 22 additions and 13 deletions

View File

@ -621,17 +621,29 @@
<sheet>
<label for="product_id" class="oe_edit_only"/>
<h1>
<field name="product_id" on_change="product_id_change(product_id)" domain="[('bom_ids','&lt;&gt;',False),('bom_ids.bom_id','=',False)]" context="{'default_supply_method':'produce'}" class="oe_inline"/>
<field name="product_id" on_change="product_id_change(product_id)" domain="[('bom_ids','&lt;&gt;',False),('bom_ids.bom_id','=',False)]" class="oe_inline"/>
</h1>
<label for="product_qty" class="oe_edit_only"/>
<h2>
<field name="product_qty" class="oe_inline"/>
<field name="product_uom" groups="product.group_uom" class="oe_inline"/>
<button type="action"
icon="terp-accessories-archiver+"
name="%(mrp.action_change_production_qty)d"
string="Change Qty" states="ready,confirmed" class="oe_inline"/>
</h2>
<group>
<group>
<label for="product_qty" class="oe_edit_only"/>
<h2>
<field name="product_qty" class="oe_inline"/>
<field name="product_uom" groups="product.group_uom" class="oe_inline"/>
<button type="action"
icon="terp-accessories-archiver+"
name="%(mrp.action_change_production_qty)d"
string="Change Qty" states="ready,confirmed" class="oe_inline"/>
</h2>
</group>
<group>
<label for="bom_id" class="oe_edit_only"/>
<h2>
<field name="bom_id" domain="[('product_id','=',product_id)]"
context="{'default_product_id': product_id}"
on_change="bom_id_change(bom_id)" class="oe_inline"/>
</h2>
</group>
</group>
<div groups="mrp.group_mrp_routings">
<label for="routing_id" class="oe_edit_only"/>
<h2><field name="routing_id" class="oe_inline"/></h2>
@ -655,9 +667,6 @@
<notebook>
<page string="Consumed Products">
<group>
<group>
<field name="bom_id" domain="[('product_id','=',product_id)]" context="{'default_product_id': product_id}" on_change="bom_id_change(bom_id)"/>
</group>
<group groups="stock.group_locations">
<field name="location_src_id" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
<field name="location_dest_id" domain="[('usage','=','internal')]"/>