diff --git a/rma/demo/stock_demo.xml b/rma/demo/stock_demo.xml
index 96659f5b..e3b4c2e8 100755
--- a/rma/demo/stock_demo.xml
+++ b/rma/demo/stock_demo.xml
@@ -1,19 +1,124 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <odoo noupdate="1">
 
-    <record id="location_rma_shop0" model="stock.location">
-        <field name="name">RMA</field>
-        <field name="usage">internal</field>
-        <field name="location_id" ref="stock.stock_location_shop0"/>
+    <!--Sequences-->
+    <record id="seq_picking_type_rma_cust_out" model="ir.sequence">
+        <field name="name">RMA Customer Sequence out</field>
+        <field name="prefix">RMA/CUST/OUT</field>
+        <field name="padding">5</field>
+        <field name="company_id" eval="False"/>
     </record>
 
+    <record id="seq_picking_type_rma_cust_in" model="ir.sequence">
+        <field name="name">RMA Customer Sequence in</field>
+        <field name="prefix">RMA/CUST/IN</field>
+        <field name="padding">5</field>
+        <field name="company_id" eval="False"/>
+    </record>
 
-    <record id="stock.stock_warehouse_shop0" model="stock.warehouse">
-        <field name="lot_rma_id" ref="location_rma_shop0"/>
-        <field name="rma_cust_out_type_id" ref="picking_type_rma_cust_out"/>
-        <field name="rma_cust_in_type_id" ref="picking_type_rma_cust_in"/>
-        <field name="rma_sup_out_type_id" ref="picking_type_rma_sup_out"/>
-        <field name="rma_sup_in_type_id" ref="picking_type_rma_sup_in"/>
+    <record id="seq_picking_type_rma_sup_out" model="ir.sequence">
+        <field name="name">RMA Supplier Sequence out</field>
+        <field name="prefix">RMA/SUPP/OUT</field>
+        <field name="padding">5</field>
+        <field name="company_id" eval="False"/>
+    </record>
+
+    <record id="seq_picking_type_rma_sup_in" model="ir.sequence">
+        <field name="name">RMA Supplier Sequence in</field>
+        <field name="prefix">RMA/SUPP/IN</field>
+        <field name="padding">5</field>
+        <field name="company_id" eval="False"/>
+    </record>
+
+    <record id="seq_picking_type_rma_dropship" model="ir.sequence">
+        <field name="name">RMA Dropship</field>
+        <field name="prefix">RMA/DS</field>
+        <field name="padding">5</field>
+        <field name="company_id" eval="False"/>
+    </record>
+
+    <!--Dropshipping Types-->
+    <record id="picking_type_rma_dropship_return" model="stock.picking.type">
+        <field name="name">Customer -> Supplier</field>
+        <field name="sequence_id" ref="seq_picking_type_rma_dropship"/>
+        <field name="default_location_src_id"
+               ref="stock.stock_location_customers"/>
+        <field name="default_location_dest_id"
+               ref="stock.stock_location_suppliers"/>
+        <field name="warehouse_id" eval="False"/>
+        <field name="code">incoming</field>
+    </record>
+
+    <record id="picking_type_rma_dropship" model="stock.picking.type">
+        <field name="name">Supplier -> Customer</field>
+        <field name="sequence_id" ref="seq_picking_type_rma_dropship"/>
+        <field name="default_location_src_id"
+               ref="stock.stock_location_suppliers"/>
+        <field name="default_location_dest_id"
+               ref="stock.stock_location_customers"/>
+        <field name="warehouse_id" eval="False"/>
+        <field name="code">incoming</field>
+    </record>
+
+    <!--Routes-->
+    <record id="route_rma_customer" model='stock.location.route'>
+        <field name="name">RMA Customer</field>
+        <field name="sequence">10</field>
+        <field name="sale_selectable" eval="False"/>
+        <field name="product_selectable" eval="False"/>
+        <field name="product_categ_selectable" eval="False"/>
+        <field name="warehouse_selectable" eval="False"/>
+        <field name="rma_selectable" eval="True"/>
+    </record>
+
+    <record id="route_rma_supplier" model='stock.location.route'>
+        <field name="name">RMA Supplier</field>
+        <field name="sequence">10</field>
+        <field name="sale_selectable" eval="False"/>
+        <field name="product_selectable" eval="False"/>
+        <field name="product_categ_selectable" eval="False"/>
+        <field name="warehouse_selectable" eval="False"/>
+        <field name="rma_selectable" eval="True"/>
+    </record>
+
+    <record id="route_rma_dropship" model='stock.location.route'>
+        <field name="name">RMA Dropship</field>
+        <field name="sequence">10</field>
+        <field name="sale_selectable" eval="False"/>
+        <field name="product_selectable" eval="False"/>
+        <field name="product_categ_selectable" eval="False"/>
+        <field name="warehouse_selectable" eval="False"/>
+        <field name="rma_selectable" eval="True"/>
+    </record>
+
+    <!--Dropship rules-->
+    <record id="rule_rma_dropship_return" model="procurement.rule">
+        <field name="name">Customer → Supplier</field>
+        <field name="action">move</field>
+        <field name="warehouse_id" ref="stock.warehouse0"/>
+        <field name="location_id" ref="stock.stock_location_suppliers"/>
+        <field name="location_src_id" ref="stock.stock_location_customers"/>
+        <field name="procure_method">make_to_stock</field>
+        <field name="route_id" ref="rma.route_rma_dropship"/>
+        <field name="picking_type_id"
+               ref="rma.picking_type_rma_dropship_return"/>
+    </record>
+
+    <record id="rule_rma_dropship" model="procurement.rule">
+        <field name="name">Supplier → Customer</field>
+        <field name="action">move</field>
+        <field name="warehouse_id" ref="stock.warehouse0"/>
+        <field name="location_id" ref="stock.stock_location_customers"/>
+        <field name="location_src_id" ref="stock.stock_location_suppliers"/>
+        <field name="procure_method">make_to_stock</field>
+        <field name="route_id" ref="rma.route_rma_dropship"/>
+        <field name="picking_type_id"
+               ref="rma.picking_type_rma_dropship"/>
+    </record>
+
+    <!-- Enable the RMA in warehouse0 -->
+    <record id='stock.warehouse0' model='stock.warehouse'>
+        <field name='rma_in_this_wh' eval='True'/>
     </record>
 
 </odoo>
diff --git a/rma/views/stock_warehouse.xml b/rma/views/stock_warehouse.xml
index fa0a76c0..4b1cc6c4 100755
--- a/rma/views/stock_warehouse.xml
+++ b/rma/views/stock_warehouse.xml
@@ -8,6 +8,9 @@
             <xpath expr="//field[@name='wh_output_stock_loc_id']" position="after">
                 <field name="lot_rma_id"/>
             </xpath>
+            <field name="resupply_wh_ids" position="after">
+                <field name="rma_in_this_wh"/>
+            </field>
             <xpath expr="//field[@name='out_type_id']" position="after">
                 <field name="rma_cust_in_type_id"/>
                 <field name="rma_cust_out_type_id"/>