diff --git a/addons/stock/procurement.py b/addons/stock/procurement.py
index 23bc2f8a12f..a42cfcd1919 100644
--- a/addons/stock/procurement.py
+++ b/addons/stock/procurement.py
@@ -48,6 +48,8 @@ class procurement_rule(osv.osv):
 
     def _get_route(self, cr, uid, ids, context=None):
         result = {}
+        if context is None:
+            context = {}
         context_with_inactive = context.copy()
         context_with_inactive['active_test']=False
         for route in self.pool.get('stock.location.route').browse(cr, uid, ids, context=context_with_inactive):
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index dcdab8f7944..1fe5dba331f 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -80,6 +80,8 @@ class stock_location(osv.osv):
 
     def _get_sublocations(self, cr, uid, ids, context=None):
         """ return all sublocations of the given stock locations (included) """
+        if context is None:
+            context = {}
         context_with_inactive = context.copy()
         context_with_inactive['active_test']=False
         return self.search(cr, uid, [('id', 'child_of', ids)], context=context_with_inactive)
diff --git a/addons/stock/stock_data.xml b/addons/stock/stock_data.xml
index 5f7870f3ecc..880bc1b6839 100644
--- a/addons/stock/stock_data.xml
+++ b/addons/stock/stock_data.xml
@@ -158,7 +158,7 @@ watch your stock valuation, and track production lots upstream and downstream (b
         -->
 
         <record id="procurement_rule_customer0" model="procurement.rule">
-            <field name="name">Stock → Customer</field>
+            <field name="name">Your Company: Stock → Customer</field>
             <field name="action">move</field>
             <field name="location_src_id" ref="stock_location_stock"/>
             <field name="location_id" ref="stock_location_customers"/>
@@ -168,12 +168,12 @@ watch your stock valuation, and track production lots upstream and downstream (b
 
     
         <record id="route_warehouse0_mto" model='stock.location.route'>
-            <field name="name">MTO</field>
+            <field name="name">Your Company: Ship Only (MTO)</field>
             <field name="sequence">10</field>
         </record>
 
         <record id="procurement_rule_customer_mto" model="procurement.rule">
-            <field name="name">Stock → Customer</field>
+            <field name="name">Your Company: Stock → Customer</field>
             <field name="action">move</field>
             <field name="location_id" ref="stock_location_customers"/>
             <field name="location_src_id" ref="stock_location_stock"/>
diff --git a/addons/stock_complex_routes/stock_complex_routes.xml b/addons/stock_complex_routes/stock_complex_routes.xml
index a7ae56d9a48..189b80cdfc1 100644
--- a/addons/stock_complex_routes/stock_complex_routes.xml
+++ b/addons/stock_complex_routes/stock_complex_routes.xml
@@ -36,25 +36,7 @@
             <field name="procure_method">make_to_stock</field>
             <field name="route_id" ref="route_drop_shipping"/>
             <field name="picking_type_id" ref="picking_type_dropship"/>
-        </record>
-
-
-        <!-- Crossdock -->
-        <record id="stock_location.route_warehouse0_crossdock" model='stock.location.route'>
-            <field name="name">Crossdock</field>
-            <field name="sale_selectable" eval="True"/>
-            <field name="product_categ_selectable" eval="True"/>
-            
-        </record>
-        <record id="procurement_rule_customer0_xdock" model="procurement.rule">
-            <field name="name"> Supplier → Output</field>
-            <field name="action">buy</field>
-            <field name="location_id" ref="stock.stock_location_output"/>
-            <field name="location_src_id" ref="stock.stock_location_suppliers"/>
-            <field name="route_id" ref="stock_location.route_warehouse0_crossdock"/>
-            <field name="picking_type_id" ref="stock.picking_type_in"/>
-        </record>
-        
+        </record>  
         
     </data>
 </openerp>
diff --git a/addons/stock_location/stock_location.py b/addons/stock_location/stock_location.py
index 1dd3e9c55b7..0df162489a6 100644
--- a/addons/stock_location/stock_location.py
+++ b/addons/stock_location/stock_location.py
@@ -454,6 +454,8 @@ class stock_warehouse(osv.osv):
     def write(self, cr, uid, ids, vals, context=None):
         if isinstance(ids, (int, long)):
             ids = [ids]
+        if context is None:
+            context = {}
         seq_obj = self.pool.get('ir.sequence')
         location_obj = self.pool.get('stock.location')
         route_obj = self.pool.get('stock.location.route')
@@ -518,6 +520,8 @@ class stock_location_path(osv.osv):
 
     def _get_route(self, cr, uid, ids, context=None):
         result = {}
+        if context is None:
+            context = {}
         context_with_inactive = context.copy()
         context_with_inactive['active_test']=False
         for route in self.pool.get('stock.location.route').browse(cr, uid, ids, context=context_with_inactive):
diff --git a/addons/stock_location/stock_location_data.xml b/addons/stock_location/stock_location_data.xml
index 4b3bfb0e176..d085e19aba0 100644
--- a/addons/stock_location/stock_location_data.xml
+++ b/addons/stock_location/stock_location_data.xml
@@ -6,21 +6,26 @@
         
         
         <record id="location_pack_zone" model="stock.location">
-            <field name="name">Pack zone</field>
-            <field name="location_id" ref="stock.stock_location_company"/>
-            <field name="usage">internal</field>
-        </record>
-        
-        <record id="location_pick_zone" model="stock.location">
-            <field name="name">Pick zone</field>
+            <field name="name">Packing zone</field>
             <field name="location_id" ref="stock.stock_location_company"/>
             <field name="usage">internal</field>
+            <field name="active" eval="False"/>
         </record>
         
         <record id="stock_location_input" model="stock.location">
             <field name="name">Input</field>
             <field name="location_id" ref="stock.stock_location_company"/>
             <field name="usage">internal</field>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="stock_location_qualitytest0" model="stock.location">
+                <field name="location_id" ref="stock.stock_location_company"/>
+                <field eval="0" name="scrap_location"/>
+                <field name="company_id" ref="base.main_company"/>
+                <field name="usage">internal</field>
+                <field name="name">Quality Control</field>
+                <field name="active" eval="False"/>
         </record>
         
         <!--
@@ -28,7 +33,7 @@
         -->
 
         <record id="route_warehouse0_mts" model='stock.location.route'>
-            <field name="name">Sale: Ship only</field>
+            <field name="name">Your Company: Ship only</field>
             <field name="sequence">20</field>
             <field name="warehouse_selectable" eval="True"/>
             <field name="product_selectable" eval="False"/>
@@ -36,13 +41,13 @@
 
 
         <record id="procurement_rule_customer0_mts" model="procurement.rule">
-            <field name="name">Stock → customer</field>
+            <field name="name">Your Company: Stock → Customers</field>
             <field name="action">move</field>
             <field name="location_id" ref="stock.stock_location_customers"/>
             <field name="location_src_id" ref="stock.stock_location_stock"/>
             <field name="procure_method">make_to_stock</field>
             <field name="route_id" ref="route_warehouse0_mts"/>
-            <field name="picking_type_id" ref="stock.picking_type_internal"/>
+            <field name="picking_type_id" ref="stock.picking_type_out"/>
         </record>
 
         <!-- Override from stock-->
@@ -55,26 +60,26 @@
             <field name="procure_method">make_to_order</field>
             <field name="route_id" ref="stock.route_warehouse0_mto"/>
             <field name="product_categ_selectable" eval="True"/>
-        </record>
-
-        <record id="route_warehouse0_mto" model='stock.location.route'>
-            <field name="name">MTO</field>
-            <field name="sequence">10</field>
-            <field name="product_categ_selectable" eval="True"/>
         </record>-->
 
+        <record id="stock.route_warehouse0_mto" model='stock.location.route'>
+            <field name="name">Your company: Ship only (MTO)</field>
+            <field name="sequence">10</field>
+            <field name="product_categ_selectable" eval="True"/>
+        </record>
+
         <record id="procurement_rule_customer0_mto" model="procurement.rule">
-            <field name="name">Stock → Customer</field>
+            <field name="name">Your Company: Stock → Customers</field>
             <field name="action">move</field>
             <field name="location_id" ref="stock.stock_location_customers"/>
             <field name="location_src_id" ref="stock.stock_location_stock"/>
             <field name="procure_method">make_to_order</field>
             <field name="route_id" ref="stock.route_warehouse0_mto"/>
-            <field name="picking_type_id" ref="stock.picking_type_internal"/>
+            <field name="picking_type_id" ref="stock.picking_type_out"/>
         </record>
 
         <record id="route_warehouse0_crossdock" model='stock.location.route'>
-            <field name="name">Crossdock</field>
+            <field name="name">Your Company: Cross-Dock</field>
             <field name="sequence">9</field>
             <field name="product_categ_selectable" eval="True"/>
             <field name="warehouse_selectable" eval="True"/>
@@ -82,127 +87,222 @@
         </record>
         
         <record id="procurement_rule_customer0_xdock" model="procurement.rule">
-            <field name="name"> Output → Customer</field>
+            <field name="name">Your Company: Stock → Customers</field>
             <field name="action">move</field>
             <field name="location_id" ref="stock.stock_location_customers"/>
-            <field name="location_src_id" ref="stock.stock_location_output"/>
+            <field name="location_src_id" ref="stock.stock_location_stock"/>
             <field name="procure_method">make_to_order</field>
             <field name="route_id" ref="route_warehouse0_crossdock"/>
             <field name="picking_type_id" ref="stock.picking_type_out"/>
         </record>
+
+        <record id="procurement_rule_customer0_xdock_start" model="procurement.rule">
+            <field name="name">Your Company: Stock → Stock</field>
+            <field name="action">move</field>
+            <field name="location_id" ref="stock.stock_location_stock"/>
+            <field name="location_src_id" ref="stock.stock_location_stock"/>
+            <field name="procure_method">make_to_stock</field>
+            <field name="route_id" ref="route_warehouse0_crossdock"/>
+            <field name="picking_type_id" ref="stock.picking_type_internal"/>
+        </record>
         
         <record id="route_warehouse0_pack" model='stock.location.route'>
-            <field name="name">Sale: Pack + Ship</field>
+            <field name="name">Your Company: Pick + Ship</field>
             <field name="sequence">15</field>
             <field name="warehouse_selectable" eval="True"/>
             <field name="product_selectable" eval="False"/>
+            <field name="active" eval="False"/>
         </record>
 
         <record id="route_warehouse0_mto_pack" model='stock.location.route'>
-            <field name="name">MTO pack</field>
+            <field name="name">Your Company: Pick + Ship (MTO)</field>
             <field name="sequence">10</field>
+            <field name="active" eval="False"/>
         </record>
 
         <record id="procurement_rule_customer0_pack" model="procurement.rule">
-            <field name="name">Stock → Output</field>
+            <field name="name">Your Company: Stock → Output</field>
             <field name="action">move</field>
             <field name="location_id" ref="stock.stock_location_output"/>
             <field name="location_src_id" ref="stock.stock_location_stock"/>
             <field name="procure_method">make_to_stock</field>
             <field name="route_id" ref="route_warehouse0_pack"/>
             <field name="picking_type_id" ref="stock.picking_type_internal"/>
+            <field name="active" eval="False"/>
         </record>
 
         <record id="procurement_rule_customer1_pack" model="procurement.rule">
-            <field name="name">Output → Customer</field>
+            <field name="name">Your Company: Output → Customers</field>
             <field name="action">move</field>
             <field name="location_id" ref="stock.stock_location_customers"/>
             <field name="location_src_id" ref="stock.stock_location_output"/>
             <field name="procure_method">make_to_order</field>
             <field name="route_id" ref="route_warehouse0_pack"/>
             <field name="picking_type_id" ref="stock.picking_type_out"/>
+            <field name="active" eval="False"/>
         </record>
 
 
         <record id="procurement_rule_customer0_mto_pack" model="procurement.rule">
-            <field name="name">Stock → Output MTO</field>
+            <field name="name">Your Company: Stock → Output</field>
             <field name="action">move</field>
             <field name="location_id" ref="stock.stock_location_output"/>
             <field name="location_src_id" ref="stock.stock_location_stock"/>
             <field name="procure_method">make_to_order</field>
             <field name="route_id" ref="route_warehouse0_mto_pack"/>
             <field name="picking_type_id" ref="stock.picking_type_internal"/>
+            <field name="active" eval="False"/>
         </record>
         
         
         <!-- Pick + pack + ship -->
         <record id="route_warehouse0_pickpack" model='stock.location.route'>
-            <field name="name">Sale: Pick + Pack + Ship</field>
+            <field name="name">Your Company: Pick + Pack + Ship</field>
             <field name="sequence">20</field>
             <field name="warehouse_selectable" eval="True"/>
             <field name="product_selectable" eval="False"/>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="route_warehouse0_mto_pickpack" model='stock.location.route'>
+            <field name="name">Your Company: Pick + Pack + Ship (MTO)</field>
+            <field name="sequence">12</field>
+            <field name="active" eval="False"/>
         </record>
 
 
         <record id="procurement_rule_customer0_pickpack" model="procurement.rule">
-            <field name="name">Stock → Pack</field>
+            <field name="name">Your Company: Stock → Packing Zone</field>
             <field name="action">move</field>
             <field name="location_id" ref="location_pack_zone"/>
             <field name="location_src_id" ref="stock.stock_location_stock"/>
             <field name="procure_method">make_to_stock</field>
             <field name="route_id" ref="route_warehouse0_pickpack"/>
             <field name="picking_type_id" ref="stock.picking_type_internal"/>
+            <field name="active" eval="False"/>
         </record>
         
         <record id="procurement_rule_customer1_pickpack" model="procurement.rule">
-            <field name="name">Output → Customer</field>
+            <field name="name">Your Company: Output → Customers</field>
             <field name="action">move</field>
             <field name="location_id" ref="stock.stock_location_customers"/>
             <field name="location_src_id" ref="stock.stock_location_output"/>
             <field name="procure_method">make_to_order</field>
             <field name="route_id" ref="route_warehouse0_pickpack"/>
             <field name="picking_type_id" ref="stock.picking_type_out"/>
+            <field name="active" eval="False"/>
         </record>
         
         <record id="procurement_rule_customer2_pickpack" model="procurement.rule">
-            <field name="name">Pack → Output</field>
+            <field name="name">Your Company: Packing Zone → Output</field>
             <field name="action">move</field>
             <field name="location_id" ref="stock.stock_location_output"/>
             <field name="location_src_id" ref="location_pack_zone"/>
             <field name="procure_method">make_to_order</field>
             <field name="route_id" ref="route_warehouse0_pickpack"/>
             <field name="picking_type_id" ref="stock.picking_type_internal"/>
+            <field name="active" eval="False"/>
         </record>
 
-        <record id="route_warehouse0_mto_pick" model='stock.location.route'>
-            <field name="name">MTO pick</field>
-            <field name="sequence">10</field>
-        </record>
-
-        <record id="procurement_rule_customer0_mto_pick" model="procurement.rule">
-            <field name="name">Stock → Pack MTO</field>
+        <record id="procurement_rule_customer0_mto_pickpack" model="procurement.rule">
+            <field name="name">Your Company: Stock → Packing Zone</field>
             <field name="action">move</field>
             <field name="location_id" ref="location_pack_zone"/>
             <field name="location_src_id" ref="stock.stock_location_stock"/>
             <field name="procure_method">make_to_order</field>
-            <field name="route_id" ref="route_warehouse0_mto_pick"/>
+            <field name="route_id" ref="route_warehouse0_mto_pickpack"/>
             <field name="picking_type_id" ref="stock.picking_type_internal"/>
+            <field name="active" eval="False"/>
         </record>
         
         <!-- 2-step reception route  -->
         <record id="route_2_push" model='stock.location.route'>
-            <field name="name">2-step Receival</field>
+            <field name="name">Your Company: Reception in 2 steps</field>
             <field name="sequence">20</field>
             <field name="product_categ_selectable" eval="True"/>
             <field name="product_selectable" eval="False"/>
+            <field name="active" eval="False"/>
         </record>
         
         <record id="push" model='stock.location.path'>
-            <field name="name">Push Input → Stock</field>
+            <field name="name">Your Company: Input → Stock</field>
             <field name="location_from_id" ref="stock_location_input"/>
             <field name="location_dest_id" ref="stock.stock_location_stock"/>
             <field name="picking_type_id" ref="stock.picking_type_internal"/>
             <field name="route_id" ref="route_2_push"/>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="procurement_rule_2_push" model="procurement.rule">
+            <field name="name">Your Company: Input → Stock</field>
+            <field name="action">move</field>
+            <field name="location_id" ref="stock.stock_location_stock"/>
+            <field name="location_src_id" ref="stock_location_input"/>
+            <field name="procure_method">make_to_stock</field>
+            <field name="route_id" ref="route_2_push"/>
+            <field name="picking_type_id" ref="stock.picking_type_internal"/>
+            <field name="active" eval="False"/>
+        </record>
+
+        <!-- 3step reception route -->
+        <record id="route_3_push" model='stock.location.route'>
+            <field name="name">Your Company: Reception in 3 steps</field>
+            <field name="sequence">22</field>
+            <field name="product_categ_selectable" eval="True"/>
+            <field name="product_selectable" eval="False"/>
+            <field name="active" eval="False"/>
+        </record>
+        
+        <record id="push3" model='stock.location.path'>
+            <field name="name">Your Company: Input → Quality Control</field>
+            <field name="location_from_id" ref="stock_location_input"/>
+            <field name="location_dest_id" ref="stock_location_qualitytest0"/>
+            <field name="picking_type_id" ref="stock.picking_type_internal"/>
+            <field name="route_id" ref="route_3_push"/>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="push3_next" model='stock.location.path'>
+            <field name="name">Your Company: Quality Control → Stock</field>
+            <field name="location_from_id" ref="stock_location_qualitytest0"/>
+            <field name="location_dest_id" ref="stock.stock_location_stock"/>
+            <field name="picking_type_id" ref="stock.picking_type_internal"/>
+            <field name="route_id" ref="route_3_push"/>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="procurement_rule_3_push" model="procurement.rule">
+            <field name="name">Your Company: Quality Control → Stock</field>
+            <field name="action">move</field>
+            <field name="location_id" ref="stock.stock_location_stock"/>
+            <field name="location_src_id" ref="stock_location_qualitytest0"/>
+            <field name="procure_method">make_to_order</field>
+            <field name="route_id" ref="route_3_push"/>
+            <field name="picking_type_id" ref="stock.picking_type_internal"/>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record id="procurement_rule_3_push_next" model="procurement.rule">
+            <field name="name">Your Company: Input → Quality Control</field>
+            <field name="action">move</field>
+            <field name="location_id" ref="stock_location_qualitytest0"/>
+            <field name="location_src_id" ref="stock_location_input"/>
+            <field name="procure_method">make_to_stock</field>
+            <field name="route_id" ref="route_3_push"/>
+            <field name="picking_type_id" ref="stock.picking_type_internal"/>
+            <field name="active" eval="False"/>
+        </record>
+
+        <!-- Set location and route information on main warehouse -->
+        <record id="stock.warehouse0" model="stock.warehouse">
+            <field name="wh_input_stock_loc_id" ref="stock_location_input"/>
+            <field name="wh_qc_stock_loc_id" ref="stock_location_qualitytest0"/>
+            <field name="wh_output_stock_loc_id" ref="stock.stock_location_output"/>
+            <field name="wh_pack_stock_loc_id" ref="location_pack_zone"/>
+            <field name="ship_route_mto" ref="stock.route_warehouse0_mto"/>
+            <field name="pick_ship_route_mto" ref="route_warehouse0_mto_pack"/>
+            <field name="pick_pack_ship_route_mto" ref="route_warehouse0_mto_pickpack"/>
+            <field name="route_ids" eval="[(4, ref('route_warehouse0_mts')), (4, ref('route_warehouse0_pack')), (4, ref('route_warehouse0_pickpack')), (4, ref('route_2_push')), (4, ref('route_3_push')), (4, ref('route_warehouse0_crossdock'))]"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/stock_location/stock_location_demo_cpu1.xml b/addons/stock_location/stock_location_demo_cpu1.xml
index f89a1f98002..d49e1730261 100644
--- a/addons/stock_location/stock_location_demo_cpu1.xml
+++ b/addons/stock_location/stock_location_demo_cpu1.xml
@@ -5,11 +5,7 @@
         </record>
 
         <record id="stock_location_qualitytest0" model="stock.location">
-                <field name="location_id" ref="stock.stock_location_company"/>
-                <field eval="0" name="scrap_location"/>
-                <field name="company_id" ref="base.main_company"/>
-                <field name="usage">internal</field>
-                <field name="name">Quality Control</field>
+                <field name="active">True</field>
         </record>
         <record id="stock_location_path_4" model="stock.location.path">
             <field model="stock.location" name="location_from_id" search="[('name', '=', u'Input')]"/>