diff --git a/addons/stock_picking_batch/data/stock_picking_batch_demo.xml b/addons/stock_picking_batch/data/stock_picking_batch_demo.xml
index f465feb5a00..bebb513a595 100644
--- a/addons/stock_picking_batch/data/stock_picking_batch_demo.xml
+++ b/addons/stock_picking_batch/data/stock_picking_batch_demo.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
+<odoo><data noupdate="1">
     <!-- Add batch picking -->
-    <record id="stock_picking_batch_dry_1" model="stock.picking.batch">
-        <field name="picking_type_id" ref="stock.picking_type_internal"/>
+    <record id="stock_picking_batch_1" model="stock.picking.batch">
+        <field name="picking_type_id" ref="stock.picking_type_out"/>
         <field name="company_id" ref="base.main_company"/>
     </record>
-    <record id="stock_picking_batch_freeze_1" model="stock.picking.batch">
-        <field name="picking_type_id" ref="stock.picking_type_internal"/>
+    <record id="stock_picking_batch_2" model="stock.picking.batch">
+        <field name="picking_type_id" ref="stock.picking_type_out"/>
         <field name="company_id" ref="base.main_company"/>
     </record>
 
@@ -55,87 +54,117 @@
         <field name="move_type">one</field>
         <field name="priority">1</field>
         <field name="user_id" eval="False"/>
-        <field name="picking_type_id" ref="stock.picking_type_internal"/>
-        <field name="batch_id" ref="stock_picking_batch_freeze_1"/>
+        <field name="picking_type_id" ref="stock.picking_type_out"/>
+        <field name="batch_id" ref="stock_picking_batch_2"/>
         <field name="location_id" ref="stock.stock_location_stock"/>
-        <field name="location_dest_id" ref="stock.stock_location_output"/>
+        <field name="location_dest_id" ref="stock.stock_location_customers"/>
         <field name="company_id" ref="base.main_company"/>
     </record>
     <record id="Picking_B" model="stock.picking">
         <field name="move_type">one</field>
         <field name="priority">0</field>
         <field name="user_id" eval="False"/>
-        <field name="picking_type_id" ref="stock.picking_type_internal"/>
-        <field name="batch_id" ref="stock_picking_batch_freeze_1"/>
+        <field name="picking_type_id" ref="stock.picking_type_out"/>
+        <field name="batch_id" ref="stock_picking_batch_2"/>
         <field name="location_id" ref="stock.stock_location_stock"/>
-        <field name="location_dest_id" ref="stock.stock_location_output"/>
+        <field name="location_dest_id" ref="stock.stock_location_customers"/>
         <field name="company_id" ref="base.main_company"/>
     </record>
     <record id="Picking_C" model="stock.picking">
         <field name="move_type">one</field>
         <field name="priority">0</field>
         <field name="user_id" eval="False"/>
-        <field name="picking_type_id" ref="stock.picking_type_internal"/>
-        <field name="batch_id" ref="stock_picking_batch_dry_1"/>
+        <field name="picking_type_id" ref="stock.picking_type_out"/>
+        <field name="batch_id" ref="stock_picking_batch_1"/>
         <field name="location_id" ref="stock.stock_location_stock"/>
-        <field name="location_dest_id" ref="stock.stock_location_output"/>
+        <field name="location_dest_id" ref="stock.stock_location_customers"/>
+        <field name="company_id" ref="base.main_company"/>
+    </record>
+    <record id="Picking_D" model="stock.picking">
+        <field name="move_type">one</field>
+        <field name="priority">1</field>
+        <field name="user_id" eval="False"/>
+        <field name="picking_type_id" ref="stock.picking_type_out"/>
+        <field name="batch_id" ref="stock_picking_batch_1"/>
+        <field name="location_id" ref="stock.stock_location_stock"/>
+        <field name="location_dest_id" ref="stock.stock_location_customers"/>
         <field name="company_id" ref="base.main_company"/>
     </record>
 
     <!-- Add stock move -->
     <record id="stock_move1" model="stock.move">
         <field name="name">A first stock move</field>
-        <field name="picking_type_id" ref="stock.picking_type_internal"/>
+        <field name="picking_type_id" ref="stock.picking_type_out"/>
         <field name="picking_id" ref="Picking_A"/>
         <field name="location_id" ref="stock.stock_location_stock"/>
-        <field name="location_dest_id" ref="stock.stock_location_output"/>
+        <field name="location_dest_id" ref="stock.stock_location_customers"/>
         <field name="product_uom_qty">10</field>
         <field name="product_uom" ref="uom.product_uom_unit" />
         <field name="product_id" ref="product.consu_delivery_01"/>
     </record>
     <record id="stock_move2" model="stock.move">
         <field name="name">A second stock move</field>
-        <field name="picking_type_id" ref="stock.picking_type_internal"/>
+        <field name="picking_type_id" ref="stock.picking_type_out"/>
         <field name="picking_id" ref="Picking_A"/>
         <field name="location_id" ref="stock.stock_location_stock"/>
-        <field name="location_dest_id" ref="stock.stock_location_output"/>
+        <field name="location_dest_id" ref="stock.stock_location_customers"/>
         <field name="product_uom_qty">10</field>
         <field name="product_uom" ref="uom.product_uom_unit" />
         <field name="product_id" ref="product.consu_delivery_02"/>
     </record>
     <record id="stock_move3" model="stock.move">
         <field name="name">A third stock move</field>
-        <field name="picking_type_id" ref="stock.picking_type_internal"/>
+        <field name="picking_type_id" ref="stock.picking_type_out"/>
         <field name="picking_id" ref="Picking_B"/>
         <field name="location_id" ref="stock.stock_location_stock"/>
-        <field name="location_dest_id" ref="stock.stock_location_output"/>
+        <field name="location_dest_id" ref="stock.stock_location_customers"/>
         <field name="product_uom_qty">10</field>
         <field name="product_uom" ref="uom.product_uom_unit" />
         <field name="product_id" ref="product.consu_delivery_03"/>
     </record>
     <record id="stock_move4" model="stock.move">
         <field name="name">A fourth stock move</field>
-        <field name="picking_type_id" ref="stock.picking_type_internal"/>
+        <field name="picking_type_id" ref="stock.picking_type_out"/>
         <field name="picking_id" ref="Picking_C"/>
         <field name="location_id" ref="stock.stock_location_stock"/>
-        <field name="location_dest_id" ref="stock.stock_location_output"/>
+        <field name="location_dest_id" ref="stock.stock_location_customers"/>
         <field name="product_uom_qty">10</field>
         <field name="product_uom" ref="uom.product_uom_unit" />
         <field name="product_id" ref="product.consu_delivery_03"/>
     </record>
+    <record id="stock_move5" model="stock.move">
+        <field name="name">A fifth stock move</field>
+        <field name="picking_type_id" ref="stock.picking_type_out"/>
+        <field name="picking_id" ref="Picking_D"/>
+        <field name="location_id" ref="stock.stock_location_stock"/>
+        <field name="location_dest_id" ref="stock.stock_location_customers"/>
+        <field name="product_uom_qty">10</field>
+        <field name="product_uom" ref="uom.product_uom_unit" />
+        <field name="product_id" ref="product.product_product_10"/>
+    </record>
+    <record id="stock_move6" model="stock.move">
+        <field name="name">A sixth stock move</field>
+        <field name="picking_type_id" ref="stock.picking_type_out"/>
+        <field name="picking_id" ref="Picking_D"/>
+        <field name="location_id" ref="stock.stock_location_stock"/>
+        <field name="location_dest_id" ref="stock.stock_location_customers"/>
+        <field name="product_uom_qty">10</field>
+        <field name="product_uom" ref="uom.product_uom_unit" />
+        <field name="product_id" ref="product.product_product_25"/>
+    </record>
 
     <!-- Confirm Batch Pickings -->
     <function model="stock.picking.batch" name="action_confirm">
-        <value eval="ref('stock_picking_batch_dry_1')"/>
+        <value eval="ref('stock_picking_batch_1')"/>
     </function>
     <function model="stock.picking.batch" name="action_confirm">
-        <value eval="ref('stock_picking_batch_freeze_1')"/>
+        <value eval="ref('stock_picking_batch_2')"/>
     </function>
     <!-- Check Availability -->
     <function model="stock.picking.batch" name="action_assign">
-        <value eval="ref('stock_picking_batch_dry_1')"/>
+        <value eval="ref('stock_picking_batch_1')"/>
     </function>
     <function model="stock.picking.batch" name="action_assign">
-        <value eval="ref('stock_picking_batch_freeze_1')"/>
+        <value eval="ref('stock_picking_batch_2')"/>
     </function>
-</odoo>
+</data></odoo>