From 15dae73907b069bd9d66c11ca22e7cbd6b6a799c Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Thu, 26 Apr 2012 10:47:17 +0530
Subject: [PATCH 1/7] [IMP]improved product form

bzr revid: dhr@tinyerp.com-20120426051717-1qwywvi0r3f62l9r
---
 addons/mrp/mrp.py                       |  6 ++++++
 addons/mrp/mrp_view.xml                 | 20 ++++++++++++++++++--
 addons/procurement/procurement_view.xml |  4 ++--
 addons/product/product_view.xml         |  1 +
 addons/stock/product_view.xml           |  1 +
 5 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 88908884b26..8d46642903e 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -1120,4 +1120,10 @@ class mrp_production_product_line(osv.osv):
     }
 mrp_production_product_line()
 
+class product_product(osv.osv):
+    _inherit="product.product"
+    _columns = {
+        'bom_ids': fields.one2many('mrp.bom', 'product_id', 'Bill of Material')
+    }
+product_product()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 76062249d7d..bf37e8463c9 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -975,7 +975,23 @@
                </data>
             </field>
         </record>
-
+		
+		<record id="product_normal_form_view" model="ir.ui.view">
+            <field name="name">product.normal.form.mrp.inherit</field>
+            <field name="model">product.product</field>
+            <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 col="2" colspan="4">
+                          <separator string="Bill of Materials" colspan="4"/>
+                          <field name="bom_ids" nolabel="1" domain="[('bom_id','=',False)]">
+                          </field>
+                      </group>
+                  </group>
+            </field>
+        </record>
+		
         <act_window
             context="{'search_default_product_id': [active_id]}"
             id="act_product_manufacturing_open"
@@ -997,7 +1013,7 @@
             groups="mrp.group_mrp_user"/>
 
         <act_window
-            domain="[('bom_id','=',False)]"
+        	 domain="[('bom_id','=',False)]"
             context="{'search_default_product_id': [active_id],'default_product_id':active_id}"
             id="act_product_product_2_mrp_bom"
             name="Bill of Materials"
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 6ce26ecb98c..cb8b9e3c007 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -283,8 +283,8 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                   <group name="misc" position="after">
-                      <group col="2" colspan="2" attrs="{'invisible':[('type', '=', 'service')]}">
-                          <separator string="Minimum Stock Rules" colspan="2"/>
+                      <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="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection"/>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 2a12fc9ad08..940c45dbce9 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -217,6 +217,7 @@
                                     </div>
                                     <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger">
                                         <img t-att-src="kanban_image('product.product', 'product_image', record.id.value)" width="48" style="float: left; padding: 0 4px 4px 0"/>
+                                        Code: <field name="code"/>
                                         <div t-if="record.type.raw_value == 'service'">No Stock</div>
                                         <t t-if="record.type.raw_value != 'service'">
                                             <div>Stock: <field name="qty_available"/> on hand, <field name="virtual_available"/> available</div>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 19533933002..796434dcd8e 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -145,6 +145,7 @@
                                 <div class="oe_product_desc">
                                     <h4><a type="edit"><field name="name"></field></a></h4>
                                     <ul>
+                                    	<li>Code: <field name="code"></field></li>
                                         <li t-if="record.type.raw_value != 'service'">Stock on hand: <field name="qty_available"/> <field name="uom_id"/></li>
                                         <li t-if="record.type.raw_value != 'service'">Stock available: <field name="virtual_available"/> <field name="uom_id"/></li>
                                         <li>Price: <field name="lst_price"></field></li>

From 7f5fdbc8a5a2e9921acf3cd79bded61e7fb658a9 Mon Sep 17 00:00:00 2001
From: "Saurang Suthar (OpenERP)" <ssu@tinyerp.com>
Date: Thu, 26 Apr 2012 18:41:13 +0530
Subject: [PATCH 2/7] [IMP]:BoM and minimum stock rules are visible directly in
 the product form without having to click on the relate icon

bzr revid: ssu@tinyerp.com-20120426131113-nhp6432tixh0e278
---
 addons/mrp/mrp_view.xml                 | 11 +----------
 addons/procurement/procurement_view.xml |  9 ---------
 addons/stock/product.py                 |  2 ++
 addons/stock/product_view.xml           |  6 ++++++
 4 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 57fffebda40..8b5bb798c37 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -450,7 +450,7 @@
             <field name="type">tree</field>
             <field name="field_parent">child_complete_ids</field>
             <field name="arch" type="xml">
-                <tree string="BoM Structure" colors="blue:method">
+                <tree string="Bill of Materials" colors="blue:method">
                     <field name="sequence" invisible="1"/>
                     <field name="name"/>
                     <field name="code"/>
@@ -1011,15 +1011,6 @@
             src_model="product.product"
             groups="mrp.group_mrp_user"/>
 
-        <act_window
-        	 domain="[('bom_id','=',False)]"
-            context="{'search_default_product_id': [active_id],'default_product_id':active_id}"
-            id="act_product_product_2_mrp_bom"
-            name="Bill of Materials"
-            res_model="mrp.bom"
-            src_model="product.product"
-            groups="mrp.group_mrp_user"/>
-
         <!-- Menu for Resource for MRP-->
 
         <record id="mrp_workcenter_action" model="ir.actions.act_window">
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 42fa0267e55..13364c7c3d9 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -251,15 +251,6 @@
         src_model="stock.warehouse"
         groups="stock.group_stock_user"/>
 
-        <!-- add product_uom to context to be the default value when adding new orderpoints -->
-        <act_window
-            context="{'product_uom': locals().has_key('uom_id') and uom_id,'search_default_product_id': [active_id], 'default_product_id': active_id}"
-            id="act_product_product_2_stock_warehouse_orderpoint"
-            name="Minimum Stock Rules"
-            res_model="stock.warehouse.orderpoint"
-            src_model="product.product"
-            groups="stock.group_stock_user"/>
-
         <act_window
             context="{'product_uom': locals().has_key('uom_id') and uom_id, 'default_procurement_id': active_id}"
             id="act_procurement_2_stock_warehouse_orderpoint"
diff --git a/addons/stock/product.py b/addons/stock/product.py
index 304fa8dcd87..4af922dc1b5 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -398,6 +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"),
     }
 
     _defaults = {
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index f702385b5b0..d3329aa65cf 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -116,6 +116,12 @@
                         <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"/>

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 3/7] [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"/>

From a60e41d9751f9c00de5e4544aba4fc91c5712090 Mon Sep 17 00:00:00 2001
From: "Saurang Suthar (OpenERP)" <ssu@tinyerp.com>
Date: Fri, 27 Apr 2012 17:45:48 +0530
Subject: [PATCH 4/7] [IMP]:seperator strings are added for BoM and Minimum
 Stock Rules

bzr revid: ssu@tinyerp.com-20120427121548-pi9af6cg2vmg4ie8
---
 addons/mrp/mrp_view.xml                 | 1 +
 addons/procurement/procurement_view.xml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index c274c5958f5..98a03cb8f14 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -983,6 +983,7 @@
             <field name="arch" type="xml">
                   <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 9deaeca66d4..1a474d4fa06 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -275,6 +275,7 @@
             <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, '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"/>

From 114d3aea2135129c7ad5eedaf71c31b15db23db9 Mon Sep 17 00:00:00 2001
From: "Saurang Suthar (OpenERP)" <ssu@tinyerp.com>
Date: Fri, 27 Apr 2012 17:55:31 +0530
Subject: [PATCH 5/7] [IMP]:remove unnecessary fields.

bzr revid: ssu@tinyerp.com-20120427122531-meepwtso51dgaony
---
 addons/stock/product.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/stock/product.py b/addons/stock/product.py
index f3b55221c82..304fa8dcd87 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -398,8 +398,6 @@ 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_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 = {

From d6ae0f8fc4c2c7e4692dc928c3226bf60fd0e2fe Mon Sep 17 00:00:00 2001
From: "Saurang Suthar (OpenERP)" <ssu@tinyerp.com>
Date: Wed, 2 May 2012 17:04:32 +0530
Subject: [PATCH 6/7] [IMP]:improved code for creating minimum stock rule and
 taking current product in BoM in product form view

bzr revid: ssu@tinyerp.com-20120502113432-1xgak350n58lbwyu
---
 addons/mrp/mrp.py                       |  5 +++--
 addons/mrp/mrp_view.xml                 |  3 +--
 addons/procurement/procurement.py       |  3 ++-
 addons/procurement/procurement_view.xml | 24 +++++++-----------------
 4 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 8d46642903e..3f3b498cca7 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -1121,9 +1121,10 @@ class mrp_production_product_line(osv.osv):
 mrp_production_product_line()
 
 class product_product(osv.osv):
-    _inherit="product.product"
+    _inherit = "product.product"
     _columns = {
-        'bom_ids': fields.one2many('mrp.bom', 'product_id', 'Bill of Material')
+        'bom_ids': fields.one2many('mrp.bom', 'product_id', 'Bill of Materials')
     }
+    
 product_product()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 98a03cb8f14..1c3a8f7f4c2 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -984,8 +984,7 @@
                   <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>
+                          <field name="bom_ids" nolabel="1" context="{'default_product_id': active_id}"/>
                       </group>
                   </group>
             </field>
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 164314c4573..cfb90fe2f6e 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -571,8 +571,9 @@ stock_warehouse_orderpoint()
 class product_product(osv.osv):
     _inherit="product.product"
     _columns = {
-        'orderpoint_ids': fields.one2many('stock.warehouse.orderpoint', 'product_id', 'Minimum Stock Rule')
+        'orderpoint_ids': fields.one2many('stock.warehouse.orderpoint', 'product_id', 'Minimum Stock Rules')
     }
+    
 product_product()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 1a474d4fa06..c44fcae68e3 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -266,30 +266,20 @@
         <menuitem id="menu_stock_procurement" name="Automatic Procurements" parent="stock.menu_stock_configuration" sequence="5"/>
             <menuitem action="action_orderpoint_form" id="menu_stock_order_points" parent="stock.menu_stock_configuration" sequence="10"/>
 
-
         <record id="product_normal_form_view" model="ir.ui.view">
             <field name="name">product.normal.form.orderpoint.inherit</field>
             <field name="model">product.product</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <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, '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"/>
-                                  <field name="product_max_qty"/>
-                                  <field name="product_uom" groups="product.group_uom"/>
-                              </tree>
-                          </field>
-                      </group>
-                  </group>
+            	<group name="misc" position="after">
+                  	<separator string="Minimum Stock Rules" colspan="4"/>
+                      		<group colspan="4">
+                            	<field name="orderpoint_ids" nolabel="1" context="{'default_product_id': active_id}"/>
+                      		</group>
+            	</group>
             </field>
         </record>
-
-
+        
     </data>
 </openerp>

From ff8d3e11d676eb85d04e1a5477b39fc3eb4a9461 Mon Sep 17 00:00:00 2001
From: "Saurang Suthar (OpenERP)" <ssu@tinyerp.com>
Date: Wed, 2 May 2012 18:18:48 +0530
Subject: [PATCH 7/7] [IMP]:improved code for creation of BoM for one2many
 issue

bzr revid: ssu@tinyerp.com-20120502124848-usphl8qr4l2b57ge
---
 addons/mrp/mrp_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 1c3a8f7f4c2..15cdd9c203c 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -413,7 +413,7 @@
                         </page>
                     </notebook>
                     <newline/>
-                    <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                    <!--field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/-->
                 </form>
             </field>
         </record>