diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 71af217de3b..0eca4f6f65b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1182,6 +1182,7 @@
                 <search string="Picking Type">
                     <field name="name" string="Picking Type"/>
                     <field name="sequence_id"/>
+                    <field name="warehouse_id"/>
                 </search>
             </field>
         </record>
diff --git a/addons/stock_multi_warehouse/__init__.py b/addons/stock_multi_warehouse/__init__.py
new file mode 100644
index 00000000000..16b38f5dadd
--- /dev/null
+++ b/addons/stock_multi_warehouse/__init__.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+import stock_multi_warehouse
\ No newline at end of file
diff --git a/addons/stock_multi_warehouse/__openerp__.py b/addons/stock_multi_warehouse/__openerp__.py
new file mode 100644
index 00000000000..a93893300a8
--- /dev/null
+++ b/addons/stock_multi_warehouse/__openerp__.py
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    'name': 'Multi-warehouse',
+    'version': '1.0',
+    'category': 'Warehousing',
+    'description': """
+This module supplements the Warehouse application with demo data for multiple warehouses
+========================================================================================
+It creates 3 warehouses
+
+    """,
+    'author': 'OpenERP SA',
+    'images': [],
+    'depends': ['stock_complex_routes'],
+    'data': ['stock_multi_warehouse.yml'],
+    'demo': [
+        
+    ],
+    'installable': True,
+    'test': [
+    ],
+    'auto_install': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_multi_warehouse/stock_multi_warehouse.py b/addons/stock_multi_warehouse/stock_multi_warehouse.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/addons/stock_multi_warehouse/stock_multi_warehouse.yml b/addons/stock_multi_warehouse/stock_multi_warehouse.yml
new file mode 100644
index 00000000000..14cbfbc9ae3
--- /dev/null
+++ b/addons/stock_multi_warehouse/stock_multi_warehouse.yml
@@ -0,0 +1,127 @@
+- 
+  Create Panama in Location structure
+- 
+  !record {model: stock.location, id: location_panama}:
+    name: Panama
+    location_id: stock.stock_location_locations
+- 
+  Create Location structure of Warehouse Panama Santiago District
+- 
+  !record {model: stock.location, id: location_panama_santiago}:
+    name: Panama Santiago District Warehouse
+    location_id: location_panama
+- 
+  Input
+- 
+  !record {model: stock.location, id: location_panama_santiago_input}:
+    name: Input
+    location_id: location_panama_santiago
+- 
+  Output
+- 
+  !record {model: stock.location, id: location_panama_santiago_output}:
+    name: Output
+    location_id: location_panama_santiago
+- 
+  Stock
+- 
+  !record {model: stock.location, id: location_panama_santiago_stock}:
+    name: Stock
+    location_id: location_panama_santiago
+    child_ids:
+      - name: Area1
+        child_ids:
+          - name: Bin 1
+          - name: Bin 2
+          - name: Bin 3
+          - name: Bin 4
+          - name: Bin 5
+          - name: Bin 6
+          - name: Bin 7
+          - name: Bin 8
+          - name: Bin 9
+          - name: Bin 10
+          - name: Bin 11
+          - name: Bin 12
+          - name: Bin 13
+          - name: Bin 14
+          - name: Bin 15
+- 
+  Create  warehouse Panama Santiago District
+- 
+  !record {model: stock.warehouse, id: wh_panama_santiago}:
+    name: Panama Santiago District Warehouse
+    lot_stock_id: location_panama_santiago
+- 
+  Create picking types for this warehouse
+- 
+  !record {model: stock.picking.type, id: picking_type_santiago_in}:
+    name: Reception
+    code_id: incoming
+    sequence_id: stock.seq_picking_type_in
+    warehouse_id: wh_panama_santiago
+    default_location_dest_id: location_panama_santiago_input 
+- 
+  Create Location structure of Warehouse Panama Main
+- 
+  !record {model: stock.location, id: location_panama_main}:
+    name: Panama Main Warehouse
+    location_id: location_panama
+- 
+  Input
+- 
+  !record {model: stock.location, id: location_panama_main_input}:
+    name: Input
+    location_id: location_panama_main
+- 
+  Output
+- 
+  !record {model: stock.location, id: location_panama_main_output}:
+    name: Output
+    location_id: location_panama_main
+- 
+  Stock
+- 
+  !record {model: stock.location, id: location_panama__main_stock}:
+    name: Stock
+    location_id: location_panama_main
+- 
+  Create  warehouse Panama Santiago District
+- 
+  !record {model: stock.warehouse, id: wh_panama_main}:
+    name: Panama Main Warehouse
+    lot_stock_id: location_panama_main
+- 
+  Create Location structure of Warehouse Dubai
+- 
+  !record {model: stock.location, id: location_panama_main}:
+    name: Panama Main Warehouse
+    location_id: location_panama
+    child_ids:
+      - name: Input
+      - name: Output
+      - name: Stock
+- 
+  Create United Arab Emirates in Location structure
+- 
+  !record {model: stock.location, id: location_uae}:
+    name: United Arab Emirates
+    location_id: stock.stock_location_locations
+- 
+  Create Location structure of Dubai Warehouse
+- 
+  !record {model: stock.location, id: location_dubai}:
+    name: Dubai Warehouse
+    location_id: location_uae
+    child_ids:
+      - name: Input
+      - name: Output
+      - name: Stock
+        child_ids:
+          - name: Area3
+- 
+  Create Dubai warehouse
+- 
+  !record {model: stock.warehouse, id: wh_dubai}:
+    name: Dubai Warehouse
+    lot_stock_id: location_dubai
\ No newline at end of file