diff --git a/addons/sale/sale_data.xml b/addons/sale/sale_data.xml
index 4622577ac3d..645fb2d871b 100644
--- a/addons/sale/sale_data.xml
+++ b/addons/sale/sale_data.xml
@@ -12,7 +12,7 @@
         <!--
     Resource: sale.shop
     -->
-        <record id="shop" model="sale.shop">
+        <record id="sale_shop_1" model="sale.shop">
             <field name="company_id" ref="base.main_company"/>
             <field name="warehouse_id" ref="stock.warehouse0"/>
             <field name="payment_default_id" ref="account.account_payment_term"/>
@@ -24,7 +24,7 @@
             <field model="res.company" name="name" search="[]" use="name"/>
         </record>
 
-        <function eval="('default',False,'shop_id', [('sale.order', False)], shop, True, False, False, False, True)" id="sale_default_set" model="ir.values" name="set"/>
+        <function eval="('default',False,'shop_id', [('sale.order', False)], sale_shop_1, True, False, False, False, True)" id="sale_default_set" model="ir.values" name="set"/>
 
     </data>
 </openerp>
diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index 9ae9ebc693d..77697fe2459 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -1,264 +1,284 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-    
-        <!--Resource: sale.order-->
-        
+
         <record id="sale_order_1" model="sale.order">
-            <field name="shop_id" ref="shop"/>
-            <field model="product.pricelist" name="pricelist_id" search="[]"/>
-            <field name="user_id" ref="base.user_root"/>
-            <field ref="base.res_partner_2" name="partner_id"/>
-            <field ref="base.res_partner_address_3" name="partner_invoice_id"/>
-            <field ref="base.res_partner_address_3" name="partner_shipping_id"/>
-            <field name="order_policy">picking</field>
-            <field name="invoice_quantity">procurement</field> 
-            <field name="note">Invoice after delivery</field>          
+            <field name="partner_id" ref="base.res_partner_2"/>
+            <field name="partner_invoice_id" ref="base.res_partner_2"/>
+            <field name="partner_shipping_id" ref="base.res_partner_2"/>
+            <field name="shop_id" ref="sale_shop_1"/>
+            <field name="user_id" ref="base.user_demo"/>
+            <field name="pricelist_id" ref="product.list0"/>
+            <field name="order_policy">prepaid</field>
         </record>
 
-        <!--Resource: sale.order.line-->
-        
-        <record id="line" model="sale.order.line">
+        <record id="sale_order_line_1" model="sale.order.line">
             <field name="order_id" ref="sale_order_1"/>
-            <field name="name">New server config + material</field>
-            <field name="product_id" ref="product.product_product_7"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="price_unit">123.20</field>
-            <field name="type">make_to_stock</field>
-        </record>
-
-        <record id="line1" model="sale.order.line">
-            <field name="order_id" ref="sale_order_1"/>
-            <field name="name">[PC1] Basic PC</field>
-            <field name="product_id" ref="product.product_product_3"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="price_unit">450.50</field>
+            <field name="name">Laptop E5023</field>
+            <field name="product_id" ref="product.product_product_25"/>
             <field name="product_uom_qty">3</field>
             <field name="product_uos_qty">3</field>
-            <field name="type">make_to_stock</field>
-        </record>
-        <record id="line13" model="sale.order.line">
-            <field name="order_id" ref="sale_order_1"/>
-            <field name="name">[PC3] Medium PC</field>
-            <field name="product_id" ref="product.product_product_5"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="price_unit">900</field>
-            <field name="product_uom_qty">5</field>
-            <field name="type">make_to_stock</field>
-            <field name="delay">1</field>
         </record>
-        <record id="line12" model="sale.order.line">
+
+        <record id="sale_order_line_2" model="sale.order.line">
             <field name="order_id" ref="sale_order_1"/>
-            <field name="name">[MB1] Mainboard ASUStek A7N8X</field>
-            <field name="product_id" ref="product.product_product_7"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="price_unit">88</field>
+            <field name="name">Pen drive, 16GB</field>
+            <field name="product_id" ref="product.product_product_30"/>
             <field name="product_uom_qty">5</field>
             <field name="product_uos_qty">5</field>
-            <field name="type">make_to_stock</field>
+            <field name="product_uom" ref="product.product_uom_unit"/>
+        </record>
+
+        <record id="sale_order_line_3" model="sale.order.line">
+            <field name="order_id" ref="sale_order_1"/>
+            <field name="name">Headset USB</field>
+            <field name="product_id" ref="product.product_product_33"/>
+            <field name="product_uom_qty">2</field>
+            <field name="product_uos_qty">2</field>
+            <field name="product_uom" ref="product.product_uom_unit"/>
         </record>
 
-        <!--Resource: sale.order-->
-        
         <record id="sale_order_2" model="sale.order">
-            <field name="shop_id" ref="shop"/>
-            <field model="product.pricelist" name="pricelist_id" search="[]"/>
-            <field name="user_id" ref="base.user_demo"/>
-            <field name="partner_id" ref="base.res_partner_2"/>
-            <field name="partner_invoice_id" ref="base.res_partner_address_4"/>
-            <field name="partner_shipping_id" ref="base.res_partner_address_4"/>
-            <field name="invoice_quantity">order</field>
-            <field name="order_policy">prepaid</field>
-            
+            <field name="partner_id" ref="base.res_partner_7"/>
+            <field name="partner_invoice_id" ref="base.res_partner_address_13"/>
+            <field name="partner_shipping_id" ref="base.res_partner_address_13"/>
+            <field name="shop_id" ref="sale_shop_1"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="pricelist_id" ref="product.list0"/>
+            <field name="order_policy">manual</field>
         </record>
 
-        <!--Resource: sale.order.line-->
-        
-        <record id="line3" model="sale.order.line">
+        <record id="sale_order_line_4" model="sale.order.line">
             <field name="order_id" ref="sale_order_2"/>
-            <field name="name">[PC2] Computer assembled on demand</field>
-            <field name="product_id" ref="product.product_product_4"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="price_unit">540</field>
-            <field name="type">make_to_order</field>
-        </record>
-        <record id="line4" model="sale.order.line">
-            <field name="order_id" ref="sale_order_2"/>
-            <field name="name">[MB1] Mainboard ASUStek (purchased on order)</field>
-            <field name="product_id" ref="product.product_product_7"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="price_unit">88</field>
-            <field name="product_uom_qty">8</field>
-            <field name="product_uos_qty">8</field>
-            <field name="type">make_to_order</field>
+            <field name="name">Service on demand</field>
+            <field name="product_id" ref="product.product_product_0"/>
+            <field name="product_uom_qty">24</field>
+            <field name="product_uos_qty">24</field>
+            <field name="product_uom" ref="product.product_uom_hour"/>
+        </record>
+
+        <record id="sale_order_line_5" model="sale.order.line">
+            <field name="order_id" ref="sale_order_2"/>
+            <field name="name">On Site Assistance</field>
+            <field name="product_id" ref="product.product_product_2"/>
+            <field name="product_uom_qty">30</field>
+            <field name="product_uos_qty">30</field>
+            <field name="product_uom" ref="product.product_uom_hour"/>
         </record>
 
-        <!--Resource: sale.order-->
-        
         <record id="sale_order_3" model="sale.order">
-            <field name="shop_id" ref="shop"/>
-            <field model="product.pricelist" name="pricelist_id" search="[]"/>
+            <field name="partner_id" ref="base.res_partner_14"/>
+            <field name="partner_invoice_id" ref="base.res_partner_14"/>
+            <field name="partner_shipping_id" ref="base.res_partner_14"/>
+            <field name="shop_id" ref="sale_shop_1"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="pricelist_id" ref="product.list0"/>
+            <field name="order_policy">manual</field>
+        </record>
+
+        <record id="sale_order_line_6" model="sale.order.line">
+            <field name="order_id" ref="sale_order_3"/>
+            <field name="name">On Site Monitoring</field>
+            <field name="product_id" ref="product.product_product_1"/>
+            <field name="product_uom_qty">10</field>
+            <field name="product_uos_qty">10</field>
+            <field name="product_uom" ref="product.product_uom_hour"/>
+        </record>
+
+        <record id="sale_order_line_7" model="sale.order.line">
+            <field name="order_id" ref="sale_order_3"/>
+            <field name="name">Toner Cartridge</field>
+            <field name="product_id" ref="product.product_product_39"/>
+            <field name="product_uom_qty">1</field>
+            <field name="product_uos_qty">1</field>
+            <field name="product_uom" ref="product.product_uom_unit"/>
+        </record>
+
+        <record id="sale_order_4" model="sale.order">
+            <field name="partner_id" ref="base.res_partner_15"/>
+            <field name="partner_invoice_id" ref="base.res_partner_address_25"/>
+            <field name="partner_shipping_id" ref="base.res_partner_address_25"/>
+            <field name="shop_id" ref="sale_shop_1"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="pricelist_id" ref="product.list0"/>
+            <field name="order_policy">prepaid</field>
+        </record>
+
+        <record id="sale_order_line_8" model="sale.order.line">
+            <field name="order_id" ref="sale_order_4"/>
+            <field name="name">Service on demand</field>
+            <field name="product_id" ref="product.product_product_0"/>
+            <field name="product_uom_qty">16</field>
+            <field name="product_uos_qty">16</field>
+            <field name="product_uom" ref="product.product_uom_hour"/>
+        </record>
+
+        <record id="sale_order_line_9" model="sale.order.line">
+            <field name="order_id" ref="sale_order_4"/>
+            <field name="name">Webcam</field>
+            <field name="product_id" ref="product.product_product_34"/>
+            <field name="product_uom_qty">10</field>
+            <field name="product_uos_qty">10</field>
+            <field name="product_uom" ref="product.product_uom_unit"/>
+        </record>
+
+        <record id="sale_order_line_10" model="sale.order.line">
+            <field name="order_id" ref="sale_order_4"/>
+            <field name="name">Multimedia Speakers</field>
+            <field name="product_id" ref="product.product_product_31"/>
+            <field name="product_uom_qty">3</field>
+            <field name="product_uos_qty">3</field>
+            <field name="product_uom" ref="product.product_uom_unit"/>
+        </record>
+
+        <record id="sale_order_line_11" model="sale.order.line">
+            <field name="order_id" ref="sale_order_4"/>
+            <field name="name">Switch, 24 ports</field>
+            <field name="product_id" ref="product.product_product_47"/>
+            <field name="product_uom_qty">2</field>
+            <field name="product_uos_qty">2</field>
+            <field name="product_uom" ref="product.product_uom_unit"/>
+        </record>
+
+        <record id="sale_order_5" model="sale.order">
+            <field name="partner_id" ref="base.res_partner_2"/>
+            <field name="partner_invoice_id" ref="base.res_partner_2"/>
+            <field name="partner_shipping_id" ref="base.res_partner_2"/>
+            <field name="shop_id" ref="sale_shop_1"/>
             <field name="user_id" ref="base.user_demo"/>
+            <field name="pricelist_id" ref="product.list0"/>
+            <field name="order_policy">picking</field>
+        </record>
+
+        <record id="sale_order_line_12" model="sale.order.line">
+            <field name="order_id" ref="sale_order_5"/>
+            <field name="name">External Hard disk</field>
+            <field name="product_id" ref="product.product_product_28"/>
+            <field name="product_uom_qty">1</field>
+            <field name="product_uos_qty">1</field>
+            <field name="product_uom" ref="product.product_uom_unit"/>
+        </record>
+
+        <record id="sale_order_line_13" model="sale.order.line">
+            <field name="order_id" ref="sale_order_5"/>
+            <field name="name">Blank DVD-RW</field>
+            <field name="product_id" ref="product.product_product_36"/>
+            <field name="product_uom_qty">3</field>
+            <field name="product_uos_qty">3</field>
+            <field name="product_uom" ref="product.product_uom_dozen"/>
+        </record>
+
+        <record id="sale_order_line_14" model="sale.order.line">
+            <field name="order_id" ref="sale_order_5"/>
+            <field name="name">Printer, All-in-one</field>
+            <field name="product_id" ref="product.product_product_37"/>
+            <field name="product_uom_qty">1</field>
+            <field name="product_uos_qty">1</field>
+            <field name="product_uom" ref="product.product_uom_unit"/>
+        </record>
+
+        <record id="sale_order_6" model="sale.order">
+            <field name="partner_id" ref="base.res_partner_18"/>
+            <field name="partner_invoice_id" ref="base.res_partner_18"/>
+            <field name="partner_shipping_id" ref="base.res_partner_18"/>
+            <field name="shop_id" ref="sale_shop_1"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="pricelist_id" ref="product.list0"/>
+            <field name="order_policy">picking</field>
+        </record>
+
+        <record id="sale_order_line_15" model="sale.order.line">
+            <field name="order_id" ref="sale_order_6"/>
+            <field name="name">PC Assamble + 2GB RAM</field>
+            <field name="product_id" ref="product.product_product_4"/>
+            <field name="product_uom_qty">1</field>
+            <field name="product_uos_qty">1</field>
+            <field name="product_uom" ref="product.product_uom_unit"/>
+        </record>
+
+        <record id="sale_order_7" model="sale.order">
             <field name="partner_id" ref="base.res_partner_11"/>
             <field name="partner_invoice_id" ref="base.res_partner_address_20"/>
             <field name="partner_shipping_id" ref="base.res_partner_address_20"/>
-            <field name="order_policy">prepaid</field>
-        </record>
-        <record id="line5" model="sale.order.line">
-            <field name="order_id" ref="sale_order_3"/>
-            <field name="name">[PC1] Basic PC</field>
-            <field name="product_id" ref="product.product_product_3"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="product_uom_qty">3</field>
-            <field name="price_unit">450</field>
-            <field name="type">make_to_order</field>
-            <field name="delay">2</field>
-        </record>
-        <record id="line6" model="sale.order.line">
-            <field name="order_id" ref="sale_order_3"/>
-            <field name="name">[PC2] Basic+ PC (assembly on order)</field>
-            <field name="product_id" ref="product.product_product_4"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="price_unit">750</field>
-            <field name="product_uom_qty">3</field>
-            <field name="type">make_to_order</field>
-            <field name="delay">7</field>
+            <field name="shop_id" ref="sale_shop_1"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="pricelist_id" ref="product.list0"/>
+            <field name="order_policy">manual</field>
         </record>
 
-        <!--Resource: sale.order-->
-        
-        <record id="sale_order_4" model="sale.order">
-            <field name="shop_id" ref="shop"/>
-            <field model="product.pricelist" name="pricelist_id" search="[]"/>
-            <field name="user_id" ref="base.user_demo"/>
-            <field name="partner_id" ref="base.res_partner_5"/>
-            <field name="partner_invoice_id" ref="base.res_partner_address_10"/>
-            <field name="partner_shipping_id" ref="base.res_partner_address_10"/>
-        </record>
-        <record id="line7" model="sale.order.line">
-            <field name="order_id" ref="sale_order_4"/>
-            <field name="name">[PC1] Basic PC</field>
-            <field name="product_id" ref="product.product_product_3"/>
+        <record id="sale_order_line_16" model="sale.order.line">
+            <field name="order_id" ref="sale_order_7"/>
+            <field name="name">Laptop E5023</field>
+            <field name="product_id" ref="product.product_product_25"/>
+            <field name="product_uom_qty">5</field>
+            <field name="product_uos_qty">5</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
+        </record>
+
+        <record id="sale_order_line_17" model="sale.order.line">
+            <field name="order_id" ref="sale_order_7"/>
+            <field name="name">GrapWorks Software</field>
+            <field name="product_id" ref="product.product_product_44"/>
+            <field name="product_uom_qty">1</field>
+            <field name="product_uos_qty">1</field>
+            <field name="product_uom" ref="product.product_uom_unit"/>
+        </record>
+
+        <record id="sale_order_line_18" model="sale.order.line">
+            <field name="order_id" ref="sale_order_7"/>
+            <field name="name">Datacard</field>
+            <field name="product_id" ref="product.product_product_46"/>
+            <field name="product_uom_qty">1</field>
+            <field name="product_uos_qty">1</field>
+            <field name="product_uom" ref="product.product_uom_unit"/>
+        </record>
+
+        <record id="sale_order_line_19" model="sale.order.line">
+            <field name="order_id" ref="sale_order_7"/>
+            <field name="name">USB Adapter</field>
+            <field name="product_id" ref="product.product_product_48"/>
+            <field name="product_uom_qty">1</field>
+            <field name="product_uos_qty">1</field>
+            <field name="product_uom" ref="product.product_uom_unit"/>
+        </record>
+
+        <record id="sale_order_8" model="sale.order">
+            <field name="partner_id" ref="base.res_partner_15"/>
+            <field name="partner_invoice_id" ref="base.res_partner_address_25"/>
+            <field name="partner_shipping_id" ref="base.res_partner_address_25"/>
+            <field name="shop_id" ref="sale_shop_1"/>
+            <field name="user_id" ref="base.user_demo"/>
+            <field name="pricelist_id" ref="product.list0"/>
+            <field name="order_policy">manual</field>
+        </record>
+
+        <record id="sale_order_line_20" model="sale.order.line">
+            <field name="order_id" ref="sale_order_8"/>
+            <field name="name">Laptop Customized</field>
+            <field name="product_id" ref="product.product_product_27"/>
             <field name="product_uom_qty">2</field>
-            <field name="price_unit">450</field>
-            <field name="type">make_to_order</field>
-            <field name="delay">8</field>
-        </record>
-        <record id="line8" model="sale.order.line">
-            <field name="order_id" ref="sale_order_4"/>
-            <field name="name">[PC3] Medium PC</field>
-            <field name="product_id" ref="product.product_product_5"/>
+            <field name="product_uos_qty">2</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="price_unit">900</field>
-            <field name="product_uom_qty">5</field>
-            <field name="type">make_to_order</field>
-            <field name="delay">1</field>
         </record>
-        <workflow action="order_confirm" model="sale.order" ref="sale_order_4"/>
 
-        <!--Resource: sale.order-->
-        
-        <record id="sale_order_5" model="sale.order">
-            <field name="shop_id" ref="shop"/>
-            <field model="product.pricelist" name="pricelist_id" search="[]"/>
-            <field name="user_id" ref="base.user_demo"/>
-            <field name="partner_id" ref="base.res_partner_3"/>
-            <field name="partner_invoice_id" ref="base.res_partner_address_5"/>
-            <field name="partner_shipping_id" ref="base.res_partner_address_5"/>
-        </record>
-        <record id="line9" model="sale.order.line">
-            <field name="order_id" ref="sale_order_5"/>
-            <field name="name">[PC2] Basic+ PC (assembly on order)</field>
-            <field name="product_id" ref="product.product_product_4"/>
+        <record id="sale_order_line_21" model="sale.order.line">
+            <field name="order_id" ref="sale_order_8"/>
+            <field name="name">Mouse, Wireless</field>
+            <field name="product_id" ref="product.product_product_12"/>
+            <field name="product_uom_qty">2</field>
+            <field name="product_uos_qty">2</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="product_uom_qty">4</field>
-            <field name="price_unit">750</field>
-            <field name="type">make_to_order</field>
-            <field name="delay">15</field>
-        </record>
-        <record id="line52" model="sale.order.line">
-            <field name="order_id" ref="sale_order_5"/>
-            <field name="name">[CPU1] Processor AMD Athlon XP 1800+</field>
-            <field name="product_id" ref="product.product_product_9"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="price_unit">75</field>
-            <field name="product_uom_qty">3</field>
-            <field name="product_uos_qty">3</field>
-            <field name="type">make_to_stock</field>
         </record>
+
+        <!-- Confirm some Sale Orders-->
+        <workflow action="order_confirm" model="sale.order" ref="sale_order_1"/>
         <workflow action="order_confirm" model="sale.order" ref="sale_order_5"/>
-
-        <!--Resource: sale.order-->
-
-        <record id="sale_order_6" model="sale.order">
-            <field name="shop_id" ref="shop"/>
-            <field model="product.pricelist" name="pricelist_id" search="[]"/>
-            <field name="user_id" ref="base.user_demo"/>
-            <field name="partner_id" ref="base.res_partner_13"/>
-            <field name="partner_invoice_id" ref="base.res_partner_address_22"/>
-            <field name="partner_shipping_id" ref="base.res_partner_address_22"/>
-        </record>
-        <record id="order6_line0" model="sale.order.line">
-            <field name="order_id" ref="sale_order_6"/>
-            <field name="name">Onsite Senior Intervention</field>
-            <field name="product_id" ref="product.product_product_2"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="product_uom_qty">4</field>
-            <field name="price_unit">250</field>
-            <field name="type">make_to_order</field>
-            <field name="delay">15</field>
-        </record>
-        <record id="order6_line1" model="sale.order.line">
-            <field name="order_id" ref="sale_order_6"/>
-            <field name="name">Onsite Intervention</field>
-            <field name="product_id" ref="product.product_product_1"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="product_uom_qty">4</field>
-            <field name="price_unit">500</field>
-            <field name="type">make_to_order</field>
-            <field name="delay">15</field>
-        </record>
-        <workflow action="order_confirm" model="sale.order" ref="sale_order_6"/>
-        <workflow action="manual_invoice" model="sale.order" ref="sale_order_6"/>
-
-        <!--Resource: sale.order-->
-
-        <record id="sale_order_7" model="sale.order">
-            <field name="shop_id" ref="shop"/>
-            <field model="product.pricelist" name="pricelist_id" search="[]"/>
-            <field name="user_id" ref="base.user_demo"/>
-            <field name="partner_id" ref="base.res_partner_12"/>
-            <field name="partner_invoice_id" ref="base.res_partner_address_22"/>
-            <field name="partner_shipping_id" ref="base.res_partner_address_22"/>
-        </record>
-        <record id="order7_line0" model="sale.order.line">
-            <field name="order_id" ref="sale_order_7"/>
-            <field name="name">[MB1] Mainboard ASUStek A7N8X</field>
-            <field name="product_id" ref="product.product_product_7"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="product_uom_qty">15</field>
-            <field name="price_unit">250</field>
-            <field name="type">make_to_stock</field>
-            <field name="delay">15</field>
-        </record>
-        <record id="order7_line1" model="sale.order.line">
-            <field name="order_id" ref="sale_order_7"/>
-            <field name="name">[MB2] Mainboard ASUStek A7V8X-X</field>
-            <field name="product_id" ref="product.product_product_6"/>
-            <field name="product_uom" ref="product.product_uom_unit"/>
-            <field name="product_uom_qty">5</field>
-            <field name="price_unit">500</field>
-            <field name="type">make_to_stock</field>
-            <field name="delay">15</field>
-        </record>
-        
-        <!-- Run all schedulers -->
-        <function model="procurement.order" name="run_scheduler"/>
+        <workflow action="order_confirm" model="sale.order" ref="sale_order_7"/>
 
         <!-- sale advance demo.. -->
         <!-- Demo Data for Product -->
-        
+
         <record id="advance_product_0" model="product.product">
             <field name="name">Advance</field>
             <field name="categ_id" ref="product.product_category_1"/>
@@ -271,8 +291,13 @@
             <field name="company_id" eval="[]"/>
         </record>
 
-    <record id="base.user_demo" model="res.users">
-        <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
-    </record>
+        <record id="base.user_demo" model="res.users">
+            <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
+        </record>
+
+
+        <!-- Run all schedulers -->
+        <function model="procurement.order" name="run_scheduler"/>
+
     </data>
 </openerp>
diff --git a/addons/sale/sale_unit_test.xml b/addons/sale/sale_unit_test.xml
index 3db5f729b41..e2a930146a7 100644
--- a/addons/sale/sale_unit_test.xml
+++ b/addons/sale/sale_unit_test.xml
@@ -3,7 +3,7 @@
     <data>
         <!-- Resource: sale.order -->
         <record id="test_order_1" model="sale.order">
-            <field name="shop_id" ref="shop"/>
+            <field name="shop_id" ref="sale_shop_1"/>
             <field model="product.pricelist" name="pricelist_id" search="[]"/>
             <field name="user_id" ref="base.user_root"/>
             <field model="res.partner" name="partner_id" search="[]"/>
diff --git a/addons/sale_margin/test/sale_margin.yml b/addons/sale_margin/test/sale_margin.yml
index 59999a782fa..17f71807074 100644
--- a/addons/sale_margin/test/sale_margin.yml
+++ b/addons/sale_margin/test/sale_margin.yml
@@ -25,7 +25,7 @@
     partner_shipping_id: base.res_partner_address_7
     picking_policy: direct
     pricelist_id: product.list0
-    shop_id: sale.shop
+    shop_id: sale.sale_shop_1
 -
   I confirm the sale order
 -
diff --git a/addons/sale_mrp/test/sale_mrp.yml b/addons/sale_mrp/test/sale_mrp.yml
index 4b8b25b0ccd..0962e1fa1ff 100644
--- a/addons/sale_mrp/test/sale_mrp.yml
+++ b/addons/sale_mrp/test/sale_mrp.yml
@@ -83,7 +83,7 @@
     partner_shipping_id: base.res_partner_address_7
     picking_policy: direct
     pricelist_id: product.list0
-    shop_id: sale.shop
+    shop_id: sale.sale_shop_1
 -
   I confirm the sale order
 -
diff --git a/addons/stock_location/stock_location_demo_cpu1.xml b/addons/stock_location/stock_location_demo_cpu1.xml
index 7028a232a34..8aa5264200b 100644
--- a/addons/stock_location/stock_location_demo_cpu1.xml
+++ b/addons/stock_location/stock_location_demo_cpu1.xml
@@ -76,13 +76,13 @@
             <field model="product.product" name="product_id" ref="product.product_product_9"/>
         </record>
 
-        <record id="sale_shop1" model="sale.shop">
+        <record id="sale_shop2" model="sale.shop">
             <field name="name">Shop 1</field>
             <field name="warehouse_id" ref="stock.stock_warehouse_shop0"/>
             <field name="company_id" ref="stock.res_company_1"/>
             <field model="account.payment.term" name="payment_default_id" search="[]"/>
         </record>
-        <record id="sale_shop2" model="sale.shop">
+        <record id="sale_shop3" model="sale.shop">
             <field name="name">Shop 2</field>
             <field name="warehouse_id" ref="stock.stock_warehouse_shop1"/>
             <field name="company_id" ref="stock.res_company_2"/>
diff --git a/addons/stock_planning/test/stock_planning.yml b/addons/stock_planning/test/stock_planning.yml
index b10bb7c0990..a7282bc91bc 100644
--- a/addons/stock_planning/test/stock_planning.yml
+++ b/addons/stock_planning/test/stock_planning.yml
@@ -160,7 +160,7 @@
     partner_shipping_id: base.res_partner_address_22
     picking_policy: direct
     pricelist_id: product.list0
-    shop_id: sale.shop
+    shop_id: sale.sale_shop_1
 -
   Now I want to calculate sales history for both the products PC1-Basic PC and PC3-Medium PC and forecast the quantity.
 -