diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml
index 155e759a549..cbc1f4d458a 100644
--- a/addons/product/product_demo.xml
+++ b/addons/product/product_demo.xml
@@ -463,18 +463,17 @@
         <field name="uom_id" ref="product_uom_unit"/>
         <field name="uom_po_id" ref="product_uom_unit"/>
         <field name="name">Restaurant Expenses</field>
-            <field eval="1" name="hr_expense_ok"/>
         <field name="categ_id" ref="product_category_otherproducts0"/>
     </record>
 
     <record id="product_product_worker0" model="product.product">
-            <field name="default_code">WORK</field>
-            <field name="supply_method">produce</field>
-            <field name="type">service</field>
-            <field eval="'make_to_order'" name="procure_method"/>
+ 		<field name="default_code">WORK</field>
+		<field name="supply_method">produce</field>
+ 		<field name="type">service</field>
+		<field eval="'make_to_order'" name="procure_method"/>
         <field eval="0" name="sale_ok"/>
         <field eval="1" name="purchase_ok"/> 
-            <field name="standard_price">20.0</field>
+        <field name="standard_price">20.0</field>
         <field name="uom_id" ref="uom_hour"/>
         <field name="uom_po_id" ref="uom_hour"/>
         <field name="name">Worker</field>
@@ -486,15 +485,12 @@
             <field name="supply_method">buy</field>
             <field name="standard_price">10.0</field>
             <field eval="0" name="sale_ok"/>
-        <field name="uom_id" ref="product_uom_unit"/>
-        <field name="uom_po_id" ref="product_uom_unit"/>
-        <field name="name">Rear Panel SHE100</field>
-            <field eval="'Public Pricelist (0.00) : 1.00
-One-shot customers (0.00) : 1.00
-Returning customers (0.00) : 0.99'" name="pricelist_sale"/>
+        	<field name="uom_id" ref="product_uom_unit"/>
+        	<field name="uom_po_id" ref="product_uom_unit"/>
+        	<field name="name">Rear Panel SHE100</field>
             <field eval="5" name="seller_delay"/>
-        <field name="categ_id" ref="product_category_misc0"/>
-    </record>
+        	<field name="categ_id" ref="product_category_misc0"/>
+	</record>
 
     <record id="product_product_rearpanelarm1" model="product.product">
             <field name="default_code">RPAN200</field>
@@ -504,9 +500,6 @@ Returning customers (0.00) : 0.99'" name="pricelist_sale"/>
         <field name="uom_id" ref="product_uom_unit"/>
         <field name="uom_po_id" ref="product_uom_unit"/>
         <field name="name">Rear Panel SHE200</field>
-            <field eval="'Public Pricelist (0.00) : 1.00
-One-shot customers (0.00) : 1.00
-Returning customers (0.00) : 0.99'" name="pricelist_sale"/>
             <field eval="5" name="seller_delay"/>
         <field name="categ_id" ref="product_category_misc0"/>
     </record>
@@ -519,9 +512,6 @@ Returning customers (0.00) : 0.99'" name="pricelist_sale"/>
         <field name="uom_id" ref="product_uom_unit"/>
         <field name="uom_po_id" ref="product_uom_unit"/>
         <field name="name">Side Panel</field>
-            <field eval="'Public Pricelist (0.00) : 1.00
-One-shot customers (0.00) : 1.00
-Returning customers (0.00) : 0.99'" name="pricelist_sale"/>
             <field eval="5" name="seller_delay"/>
         <field name="categ_id" ref="product_category_misc0"/>
     </record>
@@ -534,9 +524,6 @@ Returning customers (0.00) : 0.99'" name="pricelist_sale"/>
         <field name="uom_id" ref="product_uom_unit"/>
         <field name="uom_po_id" ref="product_uom_unit"/>
         <field name="name">Rack 100cm</field>
-            <field eval="'Public Pricelist (0.00) : 1.00
-One-shot customers (0.00) : 1.00
-Returning customers (0.00) : 0.99'" name="pricelist_sale"/>
             <field eval="8" name="seller_delay"/>
         <field name="categ_id" ref="product_category_misc0"/>
     </record>
@@ -549,9 +536,6 @@ Returning customers (0.00) : 0.99'" name="pricelist_sale"/>
         <field name="uom_id" ref="product_uom_unit"/>
         <field name="uom_po_id" ref="product_uom_unit"/>
         <field name="name">Rack 200cm</field>
-            <field eval="'Public Pricelist (0.00) : 1.00
-One-shot customers (0.00) : 1.00
-Returning customers (0.00) : 0.99'" name="pricelist_sale"/>
             <field eval="8" name="seller_delay"/>
         <field name="categ_id" ref="product_category_misc0"/>
     </record>
@@ -576,9 +560,6 @@ Returning customers (0.00) : 0.99'" name="pricelist_sale"/>
         <field name="uom_id" ref="product_uom_unit"/>
         <field name="uom_po_id" ref="product_uom_unit"/>
         <field name="name">Wood Lintel 4m</field>
-            <field eval="'Public Pricelist (0.00) : 1.00
-One-shot customers (0.00) : 1.00
-Returning customers (0.00) : 0.99'" name="pricelist_sale"/>
             <field eval="10" name="seller_delay"/>
         <field name="categ_id" ref="product_category_misc0"/>
     </record>
@@ -590,9 +571,6 @@ Returning customers (0.00) : 0.99'" name="pricelist_sale"/>
         <field name="uom_id" ref="product_uom_unit"/>
         <field name="uom_po_id" ref="product_uom_unit"/>
         <field name="name">Metal Cleats</field>
-            <field eval="'Public Pricelist (0.00) : 1.00
-One-shot customers (0.00) : 1.00
-Returning customers (0.00) : 0.99'" name="pricelist_sale"/>
             <field eval="20" name="seller_delay"/>
         <field name="categ_id" ref="product_category_misc0"/>
     </record>
@@ -607,7 +585,6 @@ Returning customers (0.00) : 0.99'" name="pricelist_sale"/>
         <field name="uom_id" ref="product_uom_unit"/>
         <field name="uom_po_id" ref="product_uom_unit"/>
         <field name="name">Hotel Expenses</field>
-            <field eval="1" name="hr_expense_ok"/>
         <field name="categ_id" ref="product_category_otherproducts0"/>
     </record>
 
diff --git a/addons/product/test/product_report.yml b/addons/product/test/product_report.yml
index 6e80083f66b..de86f392e5b 100644
--- a/addons/product/test/product_report.yml
+++ b/addons/product/test/product_report.yml
@@ -3,7 +3,7 @@
 - 
   !python {model: product.product}: |
     import netsvc, tools, os
-    data_dict = {'model': 'product.price_list'}
+    data_dict = {'model': 'product.product'}
     data_dict['form'] = {
         'qty1': 1,
         'qty2': 5,
diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index cd0fdbd682f..a6cfc961600 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -193,6 +193,48 @@
 			<field name="uom_id" ref="product.product_uom_unit"/>
 			<field name="uom_po_id" ref="product.product_uom_unit"/>
 		</record>
+		
+		<record id="product.product_product_rearpanelarm0" model="product.product">
+			<field eval="'Public Pricelist (0.00) : 1.00
+One-shot customers (0.00) : 1.00
+Returning customers (0.00) : 0.99'" name="pricelist_sale"/>
+		</record>
 
+    	<record id="product.product_product_rearpanelarm1" model="product.product">
+            <field eval="'Public Pricelist (0.00) : 1.00
+One-shot customers (0.00) : 1.00
+Returning customers (0.00) : 0.99'" name="pricelist_sale"/>
+    	</record>
+
+    	<record id="product.product_product_sidepanel0" model="product.product">
+            <field eval="'Public Pricelist (0.00) : 1.00
+One-shot customers (0.00) : 1.00
+Returning customers (0.00) : 0.99'" name="pricelist_sale"/>
+	    </record>
+
+    <record id="product.product_product_shelf0" model="product.product">
+		<field eval="'Public Pricelist (0.00) : 1.00
+One-shot customers (0.00) : 1.00
+Returning customers (0.00) : 0.99'" name="pricelist_sale"/>
+    </record>
+
+    <record id="product.product_product_shelf1" model="product.product">
+		<field eval="'Public Pricelist (0.00) : 1.00
+One-shot customers (0.00) : 1.00
+Returning customers (0.00) : 0.99'" name="pricelist_sale"/>
+    </record>
+	
+	<record id="product.product_product_woodlintelm0" model="product.product">
+		<field eval="'Public Pricelist (0.00) : 1.00
+One-shot customers (0.00) : 1.00
+Returning customers (0.00) : 0.99'" name="pricelist_sale"/>
+    </record>
+
+    <record id="product.product_product_metalcleats0" model="product.product">
+		<field eval="'Public Pricelist (0.00) : 1.00
+One-shot customers (0.00) : 1.00
+Returning customers (0.00) : 0.99'" name="pricelist_sale"/>
+    </record>
+    
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index b1f31294a97..ed93388df54 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1450,7 +1450,7 @@ class stock_move(osv.osv):
         'date': fields.datetime('Creation Date', select=True),
         'date_planned': fields.datetime('Date', required=True, help="Scheduled date for the movement of the products or real date if the move is done."),
         'date_expected': fields.datetime('Date Expected', readonly=True,required=True, help="Scheduled date for the movement of the products"),
-        'product_id': fields.many2one('product.product', 'Product', required=True, select=True),
+        'product_id': fields.many2one('product.product', 'Product', required=True, select=True, domain=[('type','<>','service')]),
 
         'product_qty': fields.float('Quantity', required=True),
         'product_uom': fields.many2one('product.uom', 'Unit of Measure', required=True),