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>