From be05cce06ac9f2bd0e4580fb908cd7f0d36fc80d Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Wed, 26 Sep 2012 17:32:41 +0530
Subject: [PATCH 01/13] [IMP] change the location of the product image

bzr revid: rma@tinyerp.com-20120926120241-r8so6d1vbxg2lu1o
---
 addons/product/product_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index c08bbc412e3..2feca4b2cda 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -60,7 +60,7 @@
             <field name="arch" type="xml">
                 <form string="Product" version="7.0">
                     <sheet>
-                        <field name="image_medium" widget="image" class="oe_avatar oe_right"/>
+                        <field name="image_medium" widget="image" class="oe_avatar oe_left"/>
                         <div class="oe_title">
                             <div class="oe_edit_only">
                                 <label for="name" string="Product Name"/>

From 7146bf55aa90d82ee33e5f4513411c67a99c4a1a Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Wed, 26 Sep 2012 18:57:02 +0530
Subject: [PATCH 02/13] [IMP] correct the string mistake in point of sale
 module

bzr revid: rma@tinyerp.com-20120926132702-einbzxd11utfn6qf
---
 addons/point_of_sale/point_of_sale.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 590718b48f0..e935379c860 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -1277,7 +1277,7 @@ class product_product(osv.osv):
         'expense_pdt': fields.boolean('Point of Sale Cash Out', help="This is a product you can use to take cash from a statement for the point of sale backend, exemple: money lost, transfer to bank, etc."),
         'pos_categ_id': fields.many2one('pos.category','Point of Sale Category',
             help="If you want to sell this product through the point of sale, select the category it belongs to."),
-        'to_weight' : fields.boolean('To Weight', help="This category contains products that should be weighted, mainly used for the self-checkout interface"),
+        'to_weight' : fields.boolean('To Weigh', help="This category contains products that should to be weighed, mainly used for the self-checkout interface"),
     }
 
     def _default_pos_categ_id(self, cr, uid, context=None):

From 017e2a2dfecc583cdb63e73df712c3dcc6d5aaa5 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Thu, 27 Sep 2012 11:38:59 +0530
Subject: [PATCH 03/13] [IMP] remove the required true field from product

bzr revid: rma@tinyerp.com-20120927060859-qd055yry892rogxu
---
 addons/product/product.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/product/product.py b/addons/product/product.py
index 8bc0789d44b..20104fdda91 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -309,7 +309,7 @@ class product_template(osv.osv):
         'uos_coeff': fields.float('Unit of Measure -> UOS Coeff', digits_compute= dp.get_precision('Product UoS'),
             help='Coefficient to convert Unit of Measure to UOS\n'
             ' uos = uom * coeff'),
-        'mes_type': fields.selection((('fixed', 'Fixed'), ('variable', 'Variable')), 'Measure Type', required=True),
+        'mes_type': fields.selection((('fixed', 'Fixed'), ('variable', 'Variable')), 'Measure Type'),
         'seller_ids': fields.one2many('product.supplierinfo', 'product_id', 'Partners'),
         'loc_rack': fields.char('Rack', size=16),
         'loc_row': fields.char('Row', size=16),

From 18fe9c60834ca1edc4fd88331d3b410676bc1b25 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Thu, 27 Sep 2012 18:31:39 +0530
Subject: [PATCH 04/13] [IMP] add the demo data file in procurement and make
 changes into the product module

bzr revid: rma@tinyerp.com-20120927130139-1hhilbveocrzuj6t
---
 addons/procurement/__openerp__.py       |   1 +
 addons/procurement/procurement.py       |   1 +
 addons/procurement/procurement_demo.xml | 173 ++++++++++++++++++++++++
 addons/product/product.py               |   2 +-
 addons/product/product_demo.xml         |  82 +++++------
 5 files changed, 217 insertions(+), 42 deletions(-)
 create mode 100644 addons/procurement/procurement_demo.xml

diff --git a/addons/procurement/__openerp__.py b/addons/procurement/__openerp__.py
index e797766eb40..29975503684 100644
--- a/addons/procurement/__openerp__.py
+++ b/addons/procurement/__openerp__.py
@@ -47,6 +47,7 @@ depending on the product's configuration.
         'security/ir.model.access.csv',
         'security/procurement_security.xml',
         'procurement_data.xml',
+        'procurement_demo.xml',
         'wizard/make_procurement_view.xml',
         'wizard/mrp_procurement_view.xml',
         'wizard/orderpoint_procurement_view.xml',
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 842f9ec27fa..05fc745b538 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -628,6 +628,7 @@ class product_product(osv.osv):
     _inherit="product.product"
     _columns = {
         'orderpoint_ids': fields.one2many('stock.warehouse.orderpoint', 'product_id', 'Minimum Stock Rules'),
+        'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumable are product where you don't manage stock."),
     }
 
 product_product()
diff --git a/addons/procurement/procurement_demo.xml b/addons/procurement/procurement_demo.xml
new file mode 100644
index 00000000000..6fc6716de80
--- /dev/null
+++ b/addons/procurement/procurement_demo.xml
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <record id="product.product_product_3" model="product.product">
+            <field name="type">product</field>
+        </record>
+        
+        <record id="product.product_product_4" model="product.product">
+            <field name="type">product</field>
+        </record>
+        <record id="product.product_product_5" model="product.product">
+            <field name="type">product</field>
+        </record>
+        
+        <record id="product.product_product_6" model="product.product">
+            <field name="type">product</field>
+        </record>
+        
+        <record id="product.product_product_7" model="product.product">
+            <field name="type">product</field>
+        </record>
+        
+        <record id="product.product_product_8" model="product.product">
+            <field name="type">product</field>
+        </record>
+        
+        <record id="product.product_product_9" model="product.product">
+            <field name="type">product</field>
+        </record>
+        
+        <record id="product.product_product_10" model="product.product">
+            <field name="type">product</field>
+        </record>
+        
+        <record id="product.product_product_11" model="product.product">
+            <field name="type">product</field>
+        </record>
+        
+        <record id="product.product_product_12" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_13" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_14" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_15" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_16" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_17" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_18" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_18" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_19" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_20" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_21" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_22" model="product.product">
+            <field name="type">product</field>
+        </record>
+        
+        <record id="product.product_product_23" model="product.product">
+            <field name="type">product</field>
+        </record>
+        
+        <record id="product.product_product_24" model="product.product">
+            <field name="type">product</field>
+        </record>
+        
+        <record id="product.product_product_25" model="product.product">
+            <field name="type">product</field>
+        </record>
+        
+        <record id="product.product_product_26" model="product.product">
+            <field name="type">product</field>
+        </record>
+        
+        <record id="product.product_product_27" model="product.product">
+            <field name="type">product</field>
+        </record>
+        
+        <record id="product.product_product_28" model="product.product">
+            <field name="type">product</field>
+        </record>
+        
+        <record id="product.product_product_29" model="product.product">
+            <field name="type">product</field>
+        </record>
+        
+        <record id="product.product_product_30" model="product.product">
+            <field name="type">product</field>
+        </record>
+        
+        <record id="product.product_product_31" model="product.product">
+            <field name="type">product</field>
+        </record>
+        
+        <record id="product.product_product_32" model="product.product">
+            <field name="type">product</field>
+        </record>
+        
+        <record id="product.product_product_33" model="product.product">
+            <field name="type">product</field>
+        </record>
+        
+        <record id="product.product_product_34" model="product.product">
+            <field name="type">product</field>
+        </record>
+        
+        <record id="product.product_product_35" model="product.product">
+            <field name="type">product</field>
+        </record>
+        
+        <record id="product.product_product_36" model="product.product">
+            <field name="type">product</field>
+        </record>
+        
+        <record id="product.product_product_37" model="product.product">
+            <field name="type">product</field>
+        </record>
+        
+        <record id="product.product_product_38" model="product.product">
+            <field name="type">product</field>
+        </record>
+        
+        <record id="product.product_product_39" model="product.product">
+            <field name="type">product</field>
+        </record>
+        
+        <record id="product.product_product_45" model="product.product">
+            <field name="type">product</field>
+        </record>
+        
+        <record id="product.product_product_46" model="product.product">
+            <field name="type">product</field>
+        </record>
+        
+        <record id="product.product_product_47" model="product.product">
+            <field name="type">product</field>
+        </record>
+        
+        <record id="product.product_product_48" model="product.product">
+            <field name="type">product</field>
+        </record>
+    
+    </data>
+</openerp>
+    
\ No newline at end of file
diff --git a/addons/product/product.py b/addons/product/product.py
index 20104fdda91..879a146fe53 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -280,7 +280,7 @@ class product_template(osv.osv):
         'description': fields.text('Description',translate=True),
         'description_purchase': fields.text('Purchase Description',translate=True),
         'description_sale': fields.text('Sale Description',translate=True),
-        'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumable are product where you don't manage stock."),
+        'type': fields.selection([('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumable are product where you don't manage stock."),
         'supply_method': fields.selection([('produce','Manufacture'),('buy','Buy')], 'Supply Method', required=True, help="Produce will generate production order or tasks, according to the product type. Buy will trigger purchase orders when requested."),
         'sale_delay': fields.float('Customer Lead Time', help="This is the average delay in days between the confirmation of the customer order and the delivery of the finished products. It's the time you promise to your customers."),
         'produce_delay': fields.float('Manufacturing Lead Time', help="Average delay in days to produce this product. This is only for the production order and, if it is a multi-level bill of material, it's only for the level of this product. Different lead times will be summed for all levels and purchase orders."),
diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml
index 97d6e03205c..bceb715cd38 100644
--- a/addons/product/product_demo.xml
+++ b/addons/product/product_demo.xml
@@ -101,7 +101,7 @@
             <field name="categ_id" ref="product_category_4"/>
             <field name="list_price">450.0</field>
             <field name="standard_price">300.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="procure_method">make_to_order</field>
             <field name="supply_method">produce</field>
             <field name="uom_id" ref="product_uom_unit"/>
@@ -119,7 +119,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_4"/>
             <field name="standard_price">500.0</field>
             <field name="list_price">750.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="procure_method">make_to_order</field>
             <field name="supply_method">produce</field>
             <field name="uom_id" ref="product_uom_unit"/>
@@ -137,7 +137,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_4"/>
             <field name="standard_price">600.0</field>
             <field name="list_price">900.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="procure_method">make_to_order</field>
             <field name="supply_method">produce</field>
             <field name="uom_id" ref="product_uom_unit"/>
@@ -152,7 +152,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">800.0</field>
             <field name="list_price">1200.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -162,7 +162,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">880.0</field>
             <field name="list_price">1350.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -172,7 +172,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">10.0</field>
             <field name="list_price">13.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -182,7 +182,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">10.0</field>
             <field name="list_price">13.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="procure_method">make_to_order</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
@@ -193,7 +193,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">12.50</field>
             <field name="list_price">14</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -203,7 +203,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">14</field>
             <field name="list_price">16.50</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -213,7 +213,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">18</field>
             <field name="list_price">12.50</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="procure_method">make_to_order</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
@@ -224,7 +224,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">78.0</field>
             <field name="list_price">85.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -234,7 +234,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">87.0</field>
             <field name="list_price">95.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -244,7 +244,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">80.0</field>
             <field name="list_price">85.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -254,7 +254,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">20.0</field>
             <field name="list_price">25.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="procure_method">make_to_order</field>
             <field name="supply_method">produce</field>
             <field name="uom_id" ref="product_uom_unit"/>
@@ -266,7 +266,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">860.0</field>
             <field name="list_price">975.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -276,7 +276,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">1020.0</field>
             <field name="list_price">1150.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="procure_method">make_to_order</field>
             <field name="supply_method">produce</field>
             <field name="uom_id" ref="product_uom_unit"/>
@@ -288,7 +288,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">1100.0</field>
             <field name="list_price">1250.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="procure_method">make_to_order</field>
             <field name="supply_method">produce</field>
             <field name="uom_id" ref="product_uom_unit"/>
@@ -301,7 +301,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">1700.0</field>
             <field name="list_price">1950.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -311,7 +311,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">1790.0</field>
             <field name="list_price">2000.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -321,7 +321,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">2010.0</field>
             <field name="list_price">2100.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -331,7 +331,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">1910.0</field>
             <field name="list_price">1980.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -341,7 +341,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">876.0</field>
             <field name="list_price">885.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -351,7 +351,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_4"/>
             <field name="standard_price">2870.0</field>
             <field name="list_price">2950.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="description">17" Monitor
@@ -365,7 +365,7 @@ QWERTY keyboard</field>
             <field name="categ_id" ref="product_category_4"/>
             <field name="standard_price">3000.0</field>
             <field name="list_price">3245.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="description">17" Monitor
@@ -379,7 +379,7 @@ QWERTY keyboard</field>
             <field name="categ_id" ref="product_category_4"/>
             <field name="standard_price">3300.0</field>
             <field name="list_price">3645.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="procure_method">make_to_order</field>
             <field name="supply_method">produce</field>
             <field name="uom_id" ref="product_uom_unit"/>
@@ -392,7 +392,7 @@ QWERTY keyboard</field>
             <field name="categ_id" ref="product_category_6"/>
             <field name="standard_price">390.0</field>
             <field name="list_price">405.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -403,7 +403,7 @@ QWERTY keyboard</field>
             <field name="categ_id" ref="product_category_7"/>
             <field name="standard_price">90.0</field>
             <field name="list_price">100.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -414,7 +414,7 @@ QWERTY keyboard</field>
             <field name="categ_id" ref="product_category_7"/>
             <field name="standard_price">126.0</field>
             <field name="list_price">145.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -424,7 +424,7 @@ QWERTY keyboard</field>
             <field name="categ_id" ref="product_category_7"/>
             <field name="standard_price">134.0</field>
             <field name="list_price">150.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="description">.</field>
@@ -435,7 +435,7 @@ QWERTY keyboard</field>
             <field name="categ_id" ref="product_category_7"/>
             <field name="standard_price">57.0</field>
             <field name="list_price">62.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="description">Hands free headset for laptop PC with in-line microphone and headphone plug.</field>
@@ -446,7 +446,7 @@ QWERTY keyboard</field>
             <field name="categ_id" ref="product_category_7"/>
             <field name="standard_price">60.0</field>
             <field name="list_price">65.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="procure_method">make_to_order</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
@@ -459,7 +459,7 @@ QWERTY keyboard</field>
             <field name="categ_id" ref="product_category_7"/>
             <field name="standard_price">38.0</field>
             <field name="list_price">45.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -470,7 +470,7 @@ QWERTY keyboard</field>
             <field name="categ_id" ref="product_category_7"/>
             <field name="standard_price">18.40</field>
             <field name="list_price">20.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_dozen"/>
             <field name="uom_po_id" ref="product_uom_dozen"/>
         </record>
@@ -481,7 +481,7 @@ QWERTY keyboard</field>
             <field name="categ_id" ref="product_category_7"/>
             <field name="standard_price">21.60</field>
             <field name="list_price">24.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_dozen"/>
             <field name="uom_po_id" ref="product_uom_dozen"/>
         </record>
@@ -492,7 +492,7 @@ QWERTY keyboard</field>
             <field name="categ_id" ref="product_category_6"/>
             <field name="standard_price">4258.0</field>
             <field name="list_price">4410.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="procure_method">make_to_order</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
@@ -505,7 +505,7 @@ QWERTY keyboard</field>
             <field name="categ_id" ref="product_category_6"/>
             <field name="standard_price">60.0</field>
             <field name="list_price">65.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -516,7 +516,7 @@ QWERTY keyboard</field>
             <field name="categ_id" ref="product_category_6"/>
             <field name="standard_price">66.0</field>
             <field name="list_price">70.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -586,7 +586,7 @@ QWERTY keyboard</field>
             <field name="categ_id" ref="product_category_6"/>
             <field name="standard_price">55.0</field>
             <field name="list_price">60.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -597,7 +597,7 @@ QWERTY keyboard</field>
             <field name="categ_id" ref="product_category_6"/>
             <field name="standard_price">35.0</field>
             <field name="list_price">40.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -608,7 +608,7 @@ QWERTY keyboard</field>
             <field name="categ_id" ref="product_category_6"/>
             <field name="standard_price">55.0</field>
             <field name="list_price">70.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -619,7 +619,7 @@ QWERTY keyboard</field>
             <field name="categ_id" ref="product_category_6"/>
             <field name="standard_price">13.0</field>
             <field name="list_price">18.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>

From b765e45c81419c0bf65589fd369d6e4cc9526235 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Fri, 28 Sep 2012 18:11:31 +0530
Subject: [PATCH 05/13] [IMP] move the procure method in product to procurement

bzr revid: rma@tinyerp.com-20120928124131-7wrkholp6ltfk23g
---
 addons/procurement/procurement.py       |  4 ++++
 addons/procurement/procurement_demo.xml | 28 ++++++++++++++++++++-----
 addons/procurement/procurement_view.xml | 26 +++++++++++++++++++++++
 addons/product/product.py               |  1 -
 addons/product/product_demo.xml         | 15 +------------
 addons/product/product_view.xml         |  8 +++----
 6 files changed, 57 insertions(+), 25 deletions(-)

diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 0fc9203dea1..d19e792243f 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -630,6 +630,10 @@ class product_product(osv.osv):
         'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumable are product where you don't manage stock."),
         'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procurement Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."),
     }
+    _defaults = {
+        'procure_method': lambda *a: 'make_to_stock',
+    }
+
 
 product_product()
 
diff --git a/addons/procurement/procurement_demo.xml b/addons/procurement/procurement_demo.xml
index 6fc6716de80..e4cf500007d 100644
--- a/addons/procurement/procurement_demo.xml
+++ b/addons/procurement/procurement_demo.xml
@@ -1,15 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+        <record id="product.product_product_1" model="product.product">
+            <field name="procure_method">make_to_order</field>
+        </record>
+        <record id="product.product_product_2" model="product.product">
+            <field name="procure_method">make_to_order</field>
+        </record>
         <record id="product.product_product_3" model="product.product">
             <field name="type">product</field>
+            <field name="procure_method">make_to_order</field>
         </record>
         
         <record id="product.product_product_4" model="product.product">
             <field name="type">product</field>
+            <field name="procure_method">make_to_order</field>
+
         </record>
         <record id="product.product_product_5" model="product.product">
             <field name="type">product</field>
+            <field name="procure_method">make_to_order</field>
         </record>
         
         <record id="product.product_product_6" model="product.product">
@@ -26,6 +36,7 @@
         
         <record id="product.product_product_9" model="product.product">
             <field name="type">product</field>
+            <field name="procure_method">make_to_order</field>
         </record>
         
         <record id="product.product_product_10" model="product.product">
@@ -38,6 +49,7 @@
         
         <record id="product.product_product_12" model="product.product">
             <field name="type">product</field>
+            <field name="procure_method">make_to_order</field>
         </record>
 
         <record id="product.product_product_13" model="product.product">
@@ -54,6 +66,7 @@
 
         <record id="product.product_product_16" model="product.product">
             <field name="type">product</field>
+            <field name="procure_method">make_to_order</field>
         </record>
 
         <record id="product.product_product_17" model="product.product">
@@ -62,14 +75,12 @@
 
         <record id="product.product_product_18" model="product.product">
             <field name="type">product</field>
-        </record>
-
-        <record id="product.product_product_18" model="product.product">
-            <field name="type">product</field>
+            <field name="procure_method">make_to_order</field>
         </record>
 
         <record id="product.product_product_19" model="product.product">
             <field name="type">product</field>
+            <field name="procure_method">make_to_order</field>
         </record>
 
         <record id="product.product_product_20" model="product.product">
@@ -102,6 +113,7 @@
         
         <record id="product.product_product_27" model="product.product">
             <field name="type">product</field>
+            <field name="procure_method">make_to_order</field>
         </record>
         
         <record id="product.product_product_28" model="product.product">
@@ -126,6 +138,7 @@
         
         <record id="product.product_product_33" model="product.product">
             <field name="type">product</field>
+            <field name="procure_method">make_to_order</field>
         </record>
         
         <record id="product.product_product_34" model="product.product">
@@ -142,6 +155,7 @@
         
         <record id="product.product_product_37" model="product.product">
             <field name="type">product</field>
+            <field name="procure_method">make_to_order</field>
         </record>
         
         <record id="product.product_product_38" model="product.product">
@@ -152,6 +166,10 @@
             <field name="type">product</field>
         </record>
         
+        <record id="product.product_product_44" model="product.product">
+            <field name="procure_method">make_to_order</field>
+        </record>
+        
         <record id="product.product_product_45" model="product.product">
             <field name="type">product</field>
         </record>
@@ -167,7 +185,7 @@
         <record id="product.product_product_48" model="product.product">
             <field name="type">product</field>
         </record>
-    
+        
     </data>
 </openerp>
     
\ No newline at end of file
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index bf73b383216..debbe03c961 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -303,6 +303,32 @@
                     <button string="Request Procurement" name="%(act_make_procurement)d" type="action"/>
                     <button string="Orderpoints" name="%(product_open_orderpoint)d" type="action"/>
                 </xpath>
+                <xpath expr="//field[@name='supply_method']" position="before">
+                    <field name="procure_method" groups="base.group_user"/> 
+                </xpath>
+                <xpath expr="//group[@name='procurement_help']" position="inside">
+                <group name="procurement_help" class="oe_grey" col="1" groups="base.group_user">
+                    <p attrs="{'invisible': [('type','&lt;&gt;','service'),('procure_method','&lt;&gt;','make_to_stock')]}">
+                        When you sell this service, nothing special will be trigered
+                        to deliver the customer, as you set the procurement method as
+                        'Make to Stock'.
+                    </p>
+                    <p attrs="{'invisible': [('type','&lt;&gt;','product'),('procure_method','&lt;&gt;','make_to_stock')]}">
+                        When you sell this product, OpenERP will <b>use the available
+                        inventory</b> for the delivery order.
+                        <br/><br/>
+                        If there are not enough quantities available, the delivery order
+                        will wait for new products. To fulfill the inventory, you should
+                        create others rules like orderpoints.
+                    </p>
+                    <p attrs="{'invisible': [('type','&lt;&gt;','consu'),('procure_method','&lt;&gt;','make_to_stock')]}">
+                        When you sell this product, a delivery order will be created.
+                        OpenERP will consider that the <b>required quantities are always
+                        available</b> as it's a consumable (as a result of this, the quantity
+                        on hand may become negative).
+                    </p>
+                </group>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/product/product.py b/addons/product/product.py
index c918a4b8661..e3afc4dbd7d 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -358,7 +358,6 @@ class product_template(osv.osv):
         'sale_delay': lambda *a: 7,
         'produce_delay': lambda *a: 1,
         'purchase_ok': lambda *a: 1,
-        'procure_method': lambda *a: 'make_to_stock',
         'uom_id': _get_uom_id,
         'uom_po_id': _get_uom_id,
         'uos_coeff' : lambda *a: 1.0,
diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml
index 7e192ff1492..76cbd6a5c5d 100644
--- a/addons/product/product_demo.xml
+++ b/addons/product/product_demo.xml
@@ -70,7 +70,6 @@
             <field name="standard_price">20.5</field>
             <field name="list_price">30.75</field>
             <field name="type">service</field>
-            <field name="procure_method">make_to_order</field>
             <field name="supply_method">produce</field>
             <field name="uom_id" ref="product_uom_hour"/>
             <field name="uom_po_id" ref="product_uom_hour"/>
@@ -84,7 +83,6 @@
             <field name="standard_price">25.5</field>
             <field name="list_price">38.25</field>
             <field name="type">service</field>
-            <field name="procure_method">make_to_order</field>
             <field name="supply_method">produce</field>
             <field name="uom_id" ref="product_uom_hour"/>
             <field name="uom_po_id" ref="product_uom_hour"/>
@@ -98,7 +96,6 @@
             <field name="list_price">450.0</field>
             <field name="standard_price">300.0</field>
             <field name="type">consu</field>
-            <field name="procure_method">make_to_order</field>
             <field name="supply_method">produce</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
@@ -116,8 +113,8 @@ HDD SH-1</field>
             <field name="standard_price">500.0</field>
             <field name="list_price">750.0</field>
             <field name="type">consu</field>
-            <field name="procure_method">make_to_order</field>
             <field name="supply_method">produce</field>
+
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="sale_delay">4.0</field>
@@ -134,7 +131,6 @@ HDD SH-1</field>
             <field name="standard_price">600.0</field>
             <field name="list_price">900.0</field>
             <field name="type">consu</field>
-            <field name="procure_method">make_to_order</field>
             <field name="supply_method">produce</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
@@ -179,7 +175,6 @@ HDD SH-1</field>
             <field name="standard_price">10.0</field>
             <field name="list_price">13.0</field>
             <field name="type">consu</field>
-            <field name="procure_method">make_to_order</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -210,7 +205,6 @@ HDD SH-1</field>
             <field name="standard_price">18</field>
             <field name="list_price">12.50</field>
             <field name="type">consu</field>
-            <field name="procure_method">make_to_order</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -251,7 +245,6 @@ HDD SH-1</field>
             <field name="standard_price">20.0</field>
             <field name="list_price">25.0</field>
             <field name="type">consu</field>
-            <field name="procure_method">make_to_order</field>
             <field name="supply_method">produce</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
@@ -273,7 +266,6 @@ HDD SH-1</field>
             <field name="standard_price">1020.0</field>
             <field name="list_price">1150.0</field>
             <field name="type">consu</field>
-            <field name="procure_method">make_to_order</field>
             <field name="supply_method">produce</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
@@ -285,7 +277,6 @@ HDD SH-1</field>
             <field name="standard_price">1100.0</field>
             <field name="list_price">1250.0</field>
             <field name="type">consu</field>
-            <field name="procure_method">make_to_order</field>
             <field name="supply_method">produce</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
@@ -376,7 +367,6 @@ QWERTY keyboard</field>
             <field name="standard_price">3300.0</field>
             <field name="list_price">3645.0</field>
             <field name="type">consu</field>
-            <field name="procure_method">make_to_order</field>
             <field name="supply_method">produce</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
@@ -443,7 +433,6 @@ QWERTY keyboard</field>
             <field name="standard_price">60.0</field>
             <field name="list_price">65.0</field>
             <field name="type">consu</field>
-            <field name="procure_method">make_to_order</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="description">Headset for laptop PC with USB connector.</field>
@@ -489,7 +478,6 @@ QWERTY keyboard</field>
             <field name="standard_price">4258.0</field>
             <field name="list_price">4410.0</field>
             <field name="type">consu</field>
-            <field name="procure_method">make_to_order</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="description">All in one hi-speed printer with fax and scanner.</field>
@@ -569,7 +557,6 @@ QWERTY keyboard</field>
             <field name="standard_price">155.0</field>
             <field name="list_price">173.0</field>
             <field name="type">consu</field>
-            <field name="procure_method">make_to_order</field>
             <field name="supply_method">produce</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 05825110851..de0c7dcdc7a 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -105,18 +105,17 @@
                             <page string="Procurements" groups="base.group_user">
                                 <group name="procurement">
                                     <group>
-                                     <!--   <field name="procure_method" groups="base.group_user"/>  -->
                                         <field name="supply_method" groups="base.group_user" invisible="1"/>
                                         <field name="cost_method" groups="product.group_costing_method"/>
                                         <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
                                     </group>
                                     <group name="procurement_help" class="oe_grey" col="1" groups="base.group_user">
-                                        <p attrs="{'invisible': [('type','&lt;&gt;','service'),('procure_method','&lt;&gt;','make_to_stock')]}">
+                                        <p attrs="{'invisible': [('type','&lt;&gt;','service')]}">
                                             When you sell this service, nothing special will be trigered
                                             to deliver the customer, as you set the procurement method as
                                             'Make to Stock'.
                                         </p>
-                                        <p attrs="{'invisible': [('type','&lt;&gt;','product'),('procure_method','&lt;&gt;','make_to_stock')]}">
+                                        <p attrs="{'invisible': [('type','&lt;&gt;','product')]}">
                                             When you sell this product, OpenERP will <b>use the available
                                             inventory</b> for the delivery order.
                                             <br/><br/>
@@ -124,7 +123,7 @@
                                             will wait for new products. To fulfill the inventory, you should
                                             create others rules like orderpoints.
                                         </p>
-                                        <p attrs="{'invisible': [('type','&lt;&gt;','consu'),('procure_method','&lt;&gt;','make_to_stock')]}">
+                                        <p attrs="{'invisible': [('type','&lt;&gt;','consu')]}">
                                             When you sell this product, a delivery order will be created.
                                             OpenERP will consider that the <b>required quantities are always
                                             available</b> as it's a consumable (as a result of this, the quantity
@@ -719,7 +718,6 @@
                             </group>
                             <group string="Procurement">
                                 <field name="type"/>
-                          <!--      <field name="procure_method"/>   -->
                                 <field name="supply_method"/>
                             </group>
 

From cd64e33d16b067847662e8f4c95221a9ec62bc15 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Mon, 1 Oct 2012 14:26:03 +0530
Subject: [PATCH 06/13] [IMP] make changes into product,procurement module

bzr revid: rma@tinyerp.com-20121001085603-1s2kt6ufg8fcom8e
---
 addons/mrp/mrp_view.xml                       |  6 ++----
 addons/procurement/procurement.py             | 19 +++++++++++++------
 addons/procurement/procurement_demo.xml       | 10 ++++++++++
 addons/procurement/procurement_view.xml       | 17 ++++++++++++++---
 addons/product/product.py                     |  2 --
 addons/product/product_demo.xml               | 10 ----------
 addons/product/product_view.xml               |  2 --
 .../purchase_requisition_view.xml             |  2 +-
 8 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index c003711ceb1..9d73705d567 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -966,7 +966,7 @@
         <record id="product.product_normal_form_supply_view" model="ir.ui.view">
             <field name="name">product.normal.form.mrp.inherit</field>
             <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="inherit_id" ref="procurement.product_template_form_view_procurement"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='supply_method']" position="attributes">
                     <attribute name="invisible">False</attribute>
@@ -977,7 +977,7 @@
                         order</b> using the bill of materials assigned to this product.
                         The delivery order will be ready once the production is done.
                     </p>
-</group>
+                </group>
             </field>
         </record>
 
@@ -1052,7 +1052,5 @@
                 </xpath>
             </field>
         </record>
-
-
     </data>
 </openerp>
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index d19e792243f..1c2decb4cdd 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -32,6 +32,19 @@ import decimal_precision as dp
 #     then wizard for picking lists & move
 #
 
+class product_template(osv.osv):
+    _inherit="product.template"
+    _columns = {
+        'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumable are product where you don't manage stock."),
+        'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procurement Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."),
+        'supply_method': fields.selection([('produce','Manufacture'),('buy','Buy')], 'Supply Method', required=True, help="Produce will generate production order or tasks, according to the product type. Buy will trigger purchase orders when requested."),
+    }
+    _defaults = {
+        'procure_method': lambda *a: 'make_to_stock',
+        'supply_method': lambda *a: 'buy',
+    }
+product_template()
+
 class mrp_property_group(osv.osv):
     """
     Group of mrp properties.
@@ -627,14 +640,8 @@ class product_product(osv.osv):
     _inherit="product.product"
     _columns = {
         'orderpoint_ids': fields.one2many('stock.warehouse.orderpoint', 'product_id', 'Minimum Stock Rules'),
-        'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumable are product where you don't manage stock."),
-        'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procurement Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."),
-    }
-    _defaults = {
-        'procure_method': lambda *a: 'make_to_stock',
     }
 
 
 product_product()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/procurement/procurement_demo.xml b/addons/procurement/procurement_demo.xml
index e4cf500007d..e28927815e3 100644
--- a/addons/procurement/procurement_demo.xml
+++ b/addons/procurement/procurement_demo.xml
@@ -3,23 +3,28 @@
     <data noupdate="1">
         <record id="product.product_product_1" model="product.product">
             <field name="procure_method">make_to_order</field>
+            <field name="supply_method">produce</field>
         </record>
         <record id="product.product_product_2" model="product.product">
             <field name="procure_method">make_to_order</field>
+            <field name="supply_method">produce</field>
         </record>
         <record id="product.product_product_3" model="product.product">
             <field name="type">product</field>
             <field name="procure_method">make_to_order</field>
+            <field name="supply_method">produce</field>
         </record>
         
         <record id="product.product_product_4" model="product.product">
             <field name="type">product</field>
             <field name="procure_method">make_to_order</field>
+            <field name="supply_method">produce</field>
 
         </record>
         <record id="product.product_product_5" model="product.product">
             <field name="type">product</field>
             <field name="procure_method">make_to_order</field>
+            <field name="supply_method">produce</field>
         </record>
         
         <record id="product.product_product_6" model="product.product">
@@ -67,6 +72,7 @@
         <record id="product.product_product_16" model="product.product">
             <field name="type">product</field>
             <field name="procure_method">make_to_order</field>
+            <field name="supply_method">produce</field>
         </record>
 
         <record id="product.product_product_17" model="product.product">
@@ -76,11 +82,13 @@
         <record id="product.product_product_18" model="product.product">
             <field name="type">product</field>
             <field name="procure_method">make_to_order</field>
+            <field name="supply_method">produce</field>
         </record>
 
         <record id="product.product_product_19" model="product.product">
             <field name="type">product</field>
             <field name="procure_method">make_to_order</field>
+            <field name="supply_method">produce</field>
         </record>
 
         <record id="product.product_product_20" model="product.product">
@@ -114,6 +122,7 @@
         <record id="product.product_product_27" model="product.product">
             <field name="type">product</field>
             <field name="procure_method">make_to_order</field>
+            <field name="supply_method">produce</field>
         </record>
         
         <record id="product.product_product_28" model="product.product">
@@ -168,6 +177,7 @@
         
         <record id="product.product_product_44" model="product.product">
             <field name="procure_method">make_to_order</field>
+            <field name="supply_method">produce</field>
         </record>
         
         <record id="product.product_product_45" model="product.product">
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index debbe03c961..8c3ae9a2336 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -303,8 +303,9 @@
                     <button string="Request Procurement" name="%(act_make_procurement)d" type="action"/>
                     <button string="Orderpoints" name="%(product_open_orderpoint)d" type="action"/>
                 </xpath>
-                <xpath expr="//field[@name='supply_method']" position="before">
-                    <field name="procure_method" groups="base.group_user"/> 
+                <xpath expr="//field[@name='cost_method']" position="before">
+                    <field name="procure_method" groups="base.group_user"/>
+                    <field name="supply_method" groups="base.group_user"/> 
                 </xpath>
                 <xpath expr="//group[@name='procurement_help']" position="inside">
                 <group name="procurement_help" class="oe_grey" col="1" groups="base.group_user">
@@ -331,6 +332,16 @@
                 </xpath>
             </field>
         </record>
-
+        <record model="ir.ui.view" id="product_template_form_view_procurement">
+            <field name="name">product.template.procurement</field>
+            <field name="model">product.template</field>
+            <field name="inherit_id" ref="product.product_template_form_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='type']" position="after">
+                    <field name="procure_method"/>
+                    <field name="supply_method"/>
+                </xpath>
+            </field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/product/product.py b/addons/product/product.py
index e3afc4dbd7d..f42aaba9e26 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -281,7 +281,6 @@ class product_template(osv.osv):
         'description_purchase': fields.text('Purchase Description',translate=True),
         'description_sale': fields.text('Sale Description',translate=True),
         'type': fields.selection([('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumable are product where you don't manage stock."),
-        'supply_method': fields.selection([('produce','Manufacture'),('buy','Buy')], 'Supply Method', required=True, help="Produce will generate production order or tasks, according to the product type. Buy will trigger purchase orders when requested."),
         'sale_delay': fields.float('Customer Lead Time', help="This is the average delay in days between the confirmation of the customer order and the delivery of the finished products. It's the time you promise to your customers."),
         'produce_delay': fields.float('Manufacturing Lead Time', help="Average delay in days to produce this product. This is only for the production order and, if it is a multi-level bill of material, it's only for the level of this product. Different lead times will be summed for all levels and purchase orders."),
         'rental': fields.boolean('Can be Rent'),
@@ -352,7 +351,6 @@ class product_template(osv.osv):
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'product.template', context=c),
         'list_price': lambda *a: 1,
         'cost_method': lambda *a: 'standard',
-        'supply_method': lambda *a: 'buy',
         'standard_price': lambda *a: 0.0,
         'sale_ok': lambda *a: 1,
         'sale_delay': lambda *a: 7,
diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml
index 76cbd6a5c5d..14477d2401a 100644
--- a/addons/product/product_demo.xml
+++ b/addons/product/product_demo.xml
@@ -70,7 +70,6 @@
             <field name="standard_price">20.5</field>
             <field name="list_price">30.75</field>
             <field name="type">service</field>
-            <field name="supply_method">produce</field>
             <field name="uom_id" ref="product_uom_hour"/>
             <field name="uom_po_id" ref="product_uom_hour"/>
             <field name="description">This type of service include basic monitoring of products.</field>
@@ -83,7 +82,6 @@
             <field name="standard_price">25.5</field>
             <field name="list_price">38.25</field>
             <field name="type">service</field>
-            <field name="supply_method">produce</field>
             <field name="uom_id" ref="product_uom_hour"/>
             <field name="uom_po_id" ref="product_uom_hour"/>
             <field name="description">This type of service include assistance for security questions, system configuration requirements, implementation or special needs.</field>
@@ -96,7 +94,6 @@
             <field name="list_price">450.0</field>
             <field name="standard_price">300.0</field>
             <field name="type">consu</field>
-            <field name="supply_method">produce</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="sale_delay">4.0</field>
@@ -113,7 +110,6 @@ HDD SH-1</field>
             <field name="standard_price">500.0</field>
             <field name="list_price">750.0</field>
             <field name="type">consu</field>
-            <field name="supply_method">produce</field>
 
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
@@ -131,7 +127,6 @@ HDD SH-1</field>
             <field name="standard_price">600.0</field>
             <field name="list_price">900.0</field>
             <field name="type">consu</field>
-            <field name="supply_method">produce</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="sale_delay">7.0</field>
@@ -245,7 +240,6 @@ HDD SH-1</field>
             <field name="standard_price">20.0</field>
             <field name="list_price">25.0</field>
             <field name="type">consu</field>
-            <field name="supply_method">produce</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -266,7 +260,6 @@ HDD SH-1</field>
             <field name="standard_price">1020.0</field>
             <field name="list_price">1150.0</field>
             <field name="type">consu</field>
-            <field name="supply_method">produce</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -277,7 +270,6 @@ HDD SH-1</field>
             <field name="standard_price">1100.0</field>
             <field name="list_price">1250.0</field>
             <field name="type">consu</field>
-            <field name="supply_method">produce</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="description">On demand hard-disk having capacity based on requirement.</field>
@@ -367,7 +359,6 @@ QWERTY keyboard</field>
             <field name="standard_price">3300.0</field>
             <field name="list_price">3645.0</field>
             <field name="type">consu</field>
-            <field name="supply_method">produce</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="description">Custom Laptop based on customer's requirement.</field>
@@ -557,7 +548,6 @@ QWERTY keyboard</field>
             <field name="standard_price">155.0</field>
             <field name="list_price">173.0</field>
             <field name="type">consu</field>
-            <field name="supply_method">produce</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="description_sale">Full featured image editing software.</field>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index de0c7dcdc7a..cc2b2b9fb63 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -105,7 +105,6 @@
                             <page string="Procurements" groups="base.group_user">
                                 <group name="procurement">
                                     <group>
-                                        <field name="supply_method" groups="base.group_user" invisible="1"/>
                                         <field name="cost_method" groups="product.group_costing_method"/>
                                         <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
                                     </group>
@@ -718,7 +717,6 @@
                             </group>
                             <group string="Procurement">
                                 <field name="type"/>
-                                <field name="supply_method"/>
                             </group>
 
                             <group string="Base Prices">
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 1fafec92bc7..a342f54edfd 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -180,7 +180,7 @@
     <record model="ir.ui.view" id="product_normal_form_view_inherit">
         <field name="name">product.form.inherit</field>
         <field name="model">product.product</field>
-        <field name="inherit_id" ref="product.product_normal_form_view"/>
+        <field name="inherit_id" ref="procurement.product_form_view_procurement_button"/>
         <field name="arch" type="xml">
             <field name="procure_method" position="before">
                 <field name="purchase_requisition"/>

From 5044ccd26462ebfa63440cb02d2fb29cbc1f8d98 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Mon, 1 Oct 2012 15:23:21 +0530
Subject: [PATCH 07/13] [IMP] make changes into warning view

bzr revid: rma@tinyerp.com-20121001095321-lysjty2w24rghk27
---
 addons/warning/warning_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/warning/warning_view.xml b/addons/warning/warning_view.xml
index fd12ce53ac9..d88dc8101a5 100644
--- a/addons/warning/warning_view.xml
+++ b/addons/warning/warning_view.xml
@@ -41,7 +41,7 @@
         <record id="product_warning_form_view" model="ir.ui.view">
             <field name="name">product.warning.form.inherit</field>
             <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="inherit_id" ref="procurement.product_template_form_view_procurement"/>
             <field name="arch" type="xml">
                 <notebook position="inside">
                     <page string="Warnings">

From 943ebfbb8b21e2f571b35e6c388d51b6d3be4d80 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Mon, 1 Oct 2012 16:16:40 +0530
Subject: [PATCH 08/13] [IMP] make changes into event_sale view

bzr revid: rma@tinyerp.com-20121001104640-xl7hmaarlaqota8m
---
 addons/event_sale/event_sale_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index 52f935a0760..c37956d4e39 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -4,7 +4,7 @@
         <record model="ir.ui.view" id="event_sale_order">
              <field name="name">event.product</field>
              <field name="model">product.product</field>
-             <field name="inherit_id" ref="product.product_normal_form_view" />
+             <field name="inherit_id" ref="procurement.product_template_form_view_procurement" />
              <field name="arch" type="xml">
                 <field name="purchase_ok" position="before">
                     <field name="event_ok" on_change="onchange_event_ok(event_ok, context)"/>

From f669a37fc01829ba7a74dc4b7157e390abcc55bb Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Mon, 1 Oct 2012 17:46:30 +0530
Subject: [PATCH 09/13] [IMP] make changes into product

bzr revid: rma@tinyerp.com-20121001121630-cvtnnh6eh86nkj1a
---
 addons/hr_expense/__openerp__.py                          | 2 +-
 addons/mrp/mrp_view.xml                                   | 2 +-
 addons/project/__openerp__.py                             | 1 +
 addons/stock/stock_demo.yml                               | 1 -
 addons/stock_no_autopicking/stock_no_autopicking_view.xml | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index 4b273a9cc81..058bf361d50 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -46,7 +46,7 @@ This module also uses analytic accounting and is compatible with the invoice on
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/hr_expenses_analysis.jpeg', 'images/hr_expenses.jpeg'],
-    'depends': ['hr', 'account_voucher'],
+    'depends': ['hr', 'account_voucher','procurement'],
     'data': [
         'security/ir.model.access.csv',
         'hr_expense_data.xml',
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 06e9fcef5bd..a245d11850c 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -966,7 +966,7 @@
         <record id="product.product_normal_form_supply_view" model="ir.ui.view">
             <field name="name">product.normal.form.mrp.inherit</field>
             <field name="model">product.product</field>
-            <field name="inherit_id" ref="procurement.product_template_form_view_procurement"/>
+            <field name="inherit_id" ref="procurement.product_form_view_procurement_button"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='supply_method']" position="attributes">
                     <attribute name="invisible">False</attribute>
diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index 85e33be777a..9f9331575e6 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -39,6 +39,7 @@
         'base_setup',
         'base_status',
         'product',
+        'procurement'
         'analytic',
         'board',
         'mail',
diff --git a/addons/stock/stock_demo.yml b/addons/stock/stock_demo.yml
index 93f488c8354..99565f0c08c 100644
--- a/addons/stock/stock_demo.yml
+++ b/addons/stock/stock_demo.yml
@@ -31,7 +31,6 @@
     name: Ice Cream
     type: product
     categ_id: product.product_category_1
-    supply_method: buy
     list_price: 100.0
     standard_price: 70.0
     uom_id: product.product_uom_kgm
diff --git a/addons/stock_no_autopicking/stock_no_autopicking_view.xml b/addons/stock_no_autopicking/stock_no_autopicking_view.xml
index 9fb2b703efe..6610d202634 100644
--- a/addons/stock_no_autopicking/stock_no_autopicking_view.xml
+++ b/addons/stock_no_autopicking/stock_no_autopicking_view.xml
@@ -5,7 +5,7 @@
         <record model="ir.ui.view" id="view_product_form_auto_pick">
             <field name="name">product.normal.auto_pick.form</field>
             <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view" />
+            <field name="inherit_id" ref="procurement.product_template_form_view_procurement"/>
             <field name="arch" type="xml">
                 <field name="product_manager" position="after">
                     <field name="auto_pick" />

From 5c02f317e1e6fe8c7223ebf81b8d5b69074768db Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Mon, 1 Oct 2012 18:12:42 +0530
Subject: [PATCH 10/13] [IMP] make changes into product

bzr revid: rma@tinyerp.com-20121001124242-b8917o6vypc382tu
---
 addons/procurement/procurement.py | 25 ++++++++++++-------------
 addons/project/__openerp__.py     |  2 +-
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index a4bb850b873..d4d306ecedb 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -32,19 +32,6 @@ import decimal_precision as dp
 #     then wizard for picking lists & move
 #
 
-class product_template(osv.osv):
-    _inherit="product.template"
-    _columns = {
-        'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumable are product where you don't manage stock."),
-        'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procurement Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."),
-        'supply_method': fields.selection([('produce','Manufacture'),('buy','Buy')], 'Supply Method', required=True, help="Produce will generate production order or tasks, according to the product type. Buy will trigger purchase orders when requested."),
-    }
-    _defaults = {
-        'procure_method': lambda *a: 'make_to_stock',
-        'supply_method': lambda *a: 'buy',
-    }
-product_template()
-
 class mrp_property_group(osv.osv):
     """
     Group of mrp properties.
@@ -654,6 +641,18 @@ class stock_warehouse_orderpoint(osv.osv):
         return super(stock_warehouse_orderpoint, self).copy(cr, uid, id, default, context=context)
 
 stock_warehouse_orderpoint()
+class product_template(osv.osv):
+    _inherit="product.template"
+    _columns = {
+        'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumable are product where you don't manage stock."),
+        'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procurement Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."),
+        'supply_method': fields.selection([('produce','Manufacture'),('buy','Buy')], 'Supply Method', required=True, help="Produce will generate production order or tasks, according to the product type. Buy will trigger purchase orders when requested."),
+    }
+    _defaults = {
+        'procure_method': lambda *a: 'make_to_stock',
+        'supply_method': lambda *a: 'buy',
+    }
+product_template()
 
 class product_product(osv.osv):
     _inherit="product.product"
diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index 9f9331575e6..5f549a719b5 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -39,7 +39,7 @@
         'base_setup',
         'base_status',
         'product',
-        'procurement'
+        'procurement',
         'analytic',
         'board',
         'mail',

From be0bf6e4e666c28cf95d578020b7891150c7a0e1 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Wed, 3 Oct 2012 10:52:00 +0530
Subject: [PATCH 11/13] [IMP] make changes into product view

bzr revid: rma@tinyerp.com-20121003052200-sauluqtzzgubn3x4
---
 addons/mrp/__openerp__.py                                 | 2 +-
 addons/mrp/mrp_view.xml                                   | 2 +-
 addons/project_mrp/project_mrp_view.xml                   | 4 ++--
 addons/stock_no_autopicking/stock_no_autopicking_view.xml | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py
index 73564f2b460..66806c4f350 100644
--- a/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@ -29,7 +29,7 @@
     'sequence': 18,
     'summary': 'Manufacturing Orders, Bill of Materials, Routing',
     'images': ['images/bill_of_materials.jpeg', 'images/manufacturing_order.jpeg', 'images/planning_manufacturing_order.jpeg', 'images/production_analysis.jpeg', 'images/production_dashboard.jpeg','images/routings.jpeg','images/work_centers.jpeg'],
-    'depends': ['procurement', 'stock', 'resource', 'purchase', 'product','process'],
+    'depends': ['product','procurement', 'stock', 'resource', 'purchase','process'],
     'description': """
 Manage the Manufacturing process in OpenERP
 ===========================================
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index a245d11850c..53dc466aaf7 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -963,7 +963,7 @@
                </data>
             </field>
         </record>
-        <record id="product.product_normal_form_supply_view" model="ir.ui.view">
+        <record id="product_product_normal_form_supply_view" model="ir.ui.view">
             <field name="name">product.normal.form.mrp.inherit</field>
             <field name="model">product.product</field>
             <field name="inherit_id" ref="procurement.product_form_view_procurement_button"/>
diff --git a/addons/project_mrp/project_mrp_view.xml b/addons/project_mrp/project_mrp_view.xml
index 51de9dd5cf3..bf3536d5273 100644
--- a/addons/project_mrp/project_mrp_view.xml
+++ b/addons/project_mrp/project_mrp_view.xml
@@ -31,10 +31,10 @@
                 </field>
             </field>
         </record>
-        <record id="product.product_normal_form_supply_view" model="ir.ui.view">
+        <record id="product_product_normal_form_supply_view" model="ir.ui.view">
             <field name="name">product.normal.form.project_mrp.inherit</field>
             <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="inherit_id" ref="procurement.product_form_view_procurement_button"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='supply_method']" position="attributes">
                     <attribute name="invisible">False</attribute>
diff --git a/addons/stock_no_autopicking/stock_no_autopicking_view.xml b/addons/stock_no_autopicking/stock_no_autopicking_view.xml
index 6610d202634..a5a96efb58d 100644
--- a/addons/stock_no_autopicking/stock_no_autopicking_view.xml
+++ b/addons/stock_no_autopicking/stock_no_autopicking_view.xml
@@ -5,7 +5,7 @@
         <record model="ir.ui.view" id="view_product_form_auto_pick">
             <field name="name">product.normal.auto_pick.form</field>
             <field name="model">product.product</field>
-            <field name="inherit_id" ref="procurement.product_template_form_view_procurement"/>
+            <field name="inherit_id" ref="procurement.product_form_view_procurement_button"/>
             <field name="arch" type="xml">
                 <field name="product_manager" position="after">
                     <field name="auto_pick" />

From 60f3b375bbeb598e2ebfc24c340f357b177921f5 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Wed, 3 Oct 2012 15:20:03 +0530
Subject: [PATCH 12/13] [IMP] make changes into thehr_expense module

bzr revid: rma@tinyerp.com-20121003095003-98n5tb4tcscn0o07
---
 addons/hr_expense/__openerp__.py | 2 +-
 addons/hr_expense/hr_expense.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index 058bf361d50..4b273a9cc81 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -46,7 +46,7 @@ This module also uses analytic accounting and is compatible with the invoice on
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/hr_expenses_analysis.jpeg', 'images/hr_expenses.jpeg'],
-    'depends': ['hr', 'account_voucher','procurement'],
+    'depends': ['hr', 'account_voucher'],
     'data': [
         'security/ir.model.access.csv',
         'hr_expense_data.xml',
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 91dc44fed61..61b091d1d51 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -243,7 +243,7 @@ class product_product(osv.osv):
         data_obj = self.pool.get('ir.model.data')
         cat_id = data_obj._get_id(cr, uid, 'hr_expense', 'cat_expense')
         categ_id = data_obj.browse(cr, uid, cat_id).res_id
-        res = {'value' : {'type':'service','procure_method':'make_to_stock','supply_method':'buy','purchase_ok':True,'sale_ok' :False,'categ_id':categ_id }}
+        res = {'value' : {'type':'service','purchase_ok':True,'sale_ok' :False,'categ_id':categ_id }}
         return res
 
 product_product()

From 18742c545d3ea3ef57cfb4a64b599ebc3b8c6f3e Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Wed, 3 Oct 2012 15:39:10 +0530
Subject: [PATCH 13/13] [IMP] make changes into project module

bzr revid: rma@tinyerp.com-20121003100910-96m1dczfdovlky6j
---
 addons/project/__openerp__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index 5f549a719b5..85e33be777a 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -39,7 +39,6 @@
         'base_setup',
         'base_status',
         'product',
-        'procurement',
         'analytic',
         'board',
         'mail',