From 439ac26da60fb570b8dd23e5675d493ee1d8a350 Mon Sep 17 00:00:00 2001
From: "Saurang Suthar (OpenERP)" <ssu@tinyerp.com>
Date: Fri, 27 Apr 2012 17:25:47 +0530
Subject: [PATCH] [IMP]:resolve error at the time of creating new product by
 improving product form view for BoM and Minimum Stock Rules

bzr revid: ssu@tinyerp.com-20120427115547-qg0w7z632h3a8e0w
---
 addons/mrp/mrp_view.xml                 | 3 +--
 addons/procurement/procurement_view.xml | 5 ++---
 addons/stock/product.py                 | 4 ++--
 addons/stock/product_view.xml           | 6 ------
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 8b5bb798c37..c274c5958f5 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -981,9 +981,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                  <group name="store" position="after">
+                  <group name="misc" position="after">
                       <group col="2" colspan="4">
-                          <separator string="Bill of Materials" colspan="4"/>
                           <field name="bom_ids" nolabel="1" domain="[('bom_id','=',False)]">
                           </field>
                       </group>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 13364c7c3d9..9deaeca66d4 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -275,9 +275,8 @@
             <field name="arch" type="xml">
                   <group name="misc" position="after">
                       <group col="2" colspan="4" attrs="{'invisible':[('type', '=', 'service')]}">
-                          <separator string="Minimum Stock Rules" colspan="4"/>
-                          <field name="orderpoint_ids" context="{'default_product_uom': uom_id}" nolabel="1">
-                              <tree string="Minimum Stock Rule" editable="bottom">
+                          <field name="orderpoint_ids" context="{'default_product_uom': uom_id, 'default_product_id': active_id}" nolabel="1">
+                              <tree string="Minimum Stock Rules" editable="bottom">
                                   <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection"/>
                                   <field name="location_id"/>
                                   <field name="product_min_qty"/>
diff --git a/addons/stock/product.py b/addons/stock/product.py
index 4af922dc1b5..f3b55221c82 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -398,8 +398,8 @@ class product_product(osv.osv):
                                         help="If real-time valuation is enabled for a product, the system will automatically write journal entries corresponding to stock moves." \
                                              "The inventory variation account set on the product category will represent the current inventory value, and the stock input and stock output account will hold the counterpart moves for incoming and outgoing products."
                                         , required=True),
-        'minimum_stock_rule': fields.one2many('stock.warehouse.orderpoint','product_id','Minimum Stock Rules', help="This is Minimum Stock Rule"),
-        'bill_of_material': fields.one2many('mrp.bom','product_id','Bill Of Materials', help="This is Bill of Materials"),
+        'minimum_stock_rules': fields.one2many('stock.warehouse.orderpoint','product_id','Minimum Stock Rules', help="This is Minimum Stock Rule"),
+        'bill_of_materials': fields.one2many('mrp.bom','bom_id','Bill Of Materials', help="This is Bill of Materials"),
     }
 
     _defaults = {
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index d3329aa65cf..f702385b5b0 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -116,12 +116,6 @@
                         <field name="incoming_qty"/>
                         <field name="outgoing_qty"/>
                     </group>
-                    <group colspan="4">
-                        <field name="minimum_stock_rule" nolabel="1" context="{'default_product_id': active_id}"/>
-                    </group>
-                    <group colspan="4">
-						<field name="bill_of_material" nolabel="1" context="{'default_product_id': active_id}"/>
-                    </group>                                        
                     <group colspan="2" col="2" name="lot" groups="stock.group_tracking_lot,stock.group_production_lot">
                         <separator string="Lots" colspan="4"/>
                         <field name="track_production" groups="stock.group_production_lot"/>