diff --git a/mrp_operations_extension/README.rst b/mrp_operations_extension/README.rst
index 2ef8f8b32..56cd686c0 100644
--- a/mrp_operations_extension/README.rst
+++ b/mrp_operations_extension/README.rst
@@ -10,3 +10,16 @@ This module adds:
 
 Controls the availability of material in operations, and controls operation
 start with respect to previous.
+
+
+Credits
+=======
+
+Contributors
+------------
+
+* Daniel Campos <danielcampos@avanzosc.es>
+* Mikel Arregi <mikelarregi@avanzosc.es>
+* Oihane Crucelaegui <oihanecrucelaegi@avanzosc.es>
+* Pedro M. Baeza <pedro.baeza@serviciosbaeza.com>
+* Ana Juaristi <anajuaristi@avanzosc.es>
diff --git a/mrp_operations_extension/__openerp__.py b/mrp_operations_extension/__openerp__.py
index 717087855..87678c1fa 100644
--- a/mrp_operations_extension/__openerp__.py
+++ b/mrp_operations_extension/__openerp__.py
@@ -21,8 +21,8 @@
     "name": "MRP Operations Extension",
     "version": "1.0",
     "category": "Manufacturing",
-    "author": "OdooMRP team,"
-              "AvanzOSC,"
+    "author": "OdooMRP team, "
+              "AvanzOSC, "
               "Serv. Tecnol. Avanzados - Pedro M. Baeza",
     "website": "http://www.odoomrp.com",
     "contributors": [
@@ -30,7 +30,7 @@
         "Mikel Arregi <mikelarregi@avanzosc.es>",
         "Oihane Crucelaegui <oihanecrucelaegi@avanzosc.es>",
         "Pedro M. Baeza <pedro.baeza@serviciosbaeza.com>",
-        "Ana Juaristi <ajuaristio@gmail.com>",
+        "Ana Juaristi <anajuaristi@avanzosc.es>",
     ],
     "depends": [
         "mrp_operations",
@@ -50,5 +50,9 @@
         "security/ir.model.access.csv",
         "security/mrp_operations_extension_security.xml",
     ],
+    "demo": [
+        "demo/mrp_bom_demo.xml",
+        "demo/mrp_routing_demo.xml",
+    ],
     "installable": True
 }
diff --git a/mrp_operations_extension/demo/mrp_bom_demo.xml b/mrp_operations_extension/demo/mrp_bom_demo.xml
new file mode 100644
index 000000000..a0e3183f4
--- /dev/null
+++ b/mrp_operations_extension/demo/mrp_bom_demo.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data noupdate="1">
+        <record model="mrp.bom" id="mrp.mrp_bom_8">
+            <field name="routing_id" ref="mrp.mrp_routing_2" />
+        </record>
+
+        <record model="mrp.bom.line" id="mrp.mrp_bom_line_1">
+            <field name="operation" ref="mrp.mrp_routing_workcenter_0" />
+        </record>
+
+        <record model="mrp.bom.line" id="mrp.mrp_bom_line_2">
+            <field name="operation" ref="mrp.mrp_routing_workcenter_1" />
+        </record>
+
+        <record model="mrp.bom.line" id="mrp.mrp_bom_line_4">
+            <field name="operation" ref="mrp.mrp_routing_workcenter_4" />
+        </record>
+
+        <record model="mrp.bom.line" id="mrp.mrp_bom_line_5">
+            <field name="operation" ref="mrp.mrp_routing_workcenter_4" />
+        </record>
+
+        <record model="mrp.bom.line" id="mrp.mrp_bom_line_6">
+            <field name="operation" ref="mrp.mrp_routing_workcenter_4" />
+        </record>
+
+        <record model="mrp.bom.line" id="mrp.mrp_bom_line_17">
+            <field name="operation" ref="mrp.mrp_routing_workcenter_2" />
+        </record>
+
+        <record model="mrp.bom.line" id="mrp.mrp_bom_line_18">
+            <field name="operation" ref="mrp.mrp_routing_workcenter_2" />
+        </record>
+
+        <record model="mrp.bom.line" id="mrp.mrp_bom_line_19">
+            <field name="operation" ref="mrp.mrp_routing_workcenter_2" />
+        </record>
+
+        <record model="mrp.bom.line" id="mrp.mrp_bom_line_20">
+            <field name="operation" ref="mrp.mrp_routing_workcenter_2" />
+        </record>
+
+        <record model="mrp.bom.line" id="mrp.mrp_bom_line_21">
+            <field name="operation" ref="mrp.mrp_routing_workcenter_2" />
+        </record>
+
+        <record model="mrp.bom.line" id="mrp.mrp_bom_line_22">
+            <field name="operation" ref="mrp.mrp_routing_workcenter_2" />
+        </record>
+
+        <record model="mrp.bom.line" id="mrp.mrp_bom_line_23">
+            <field name="operation" ref="mrp.mrp_routing_workcenter_2" />
+        </record>
+
+        <record model="mrp.bom.line" id="mrp.mrp_bom_line_24">
+            <field name="operation" ref="mrp.mrp_routing_workcenter_2" />
+        </record>
+
+        <record model="mrp.bom.line" id="mrp.mrp_bom_line_25">
+            <field name="operation" ref="mrp.mrp_routing_workcenter_2" />
+        </record>
+
+        <record model="mrp.bom.line" id="mrp.mrp_bom_line_26">
+            <field name="operation" ref="mrp.mrp_routing_workcenter_2" />
+        </record>
+
+        <record model="mrp.bom.line" id="mrp.mrp_bom_line_27">
+            <field name="operation" ref="mrp.mrp_routing_workcenter_2" />
+        </record>
+
+        <record model="mrp.bom.line" id="mrp.mrp_bom_line_28">
+            <field name="operation" ref="mrp.mrp_routing_workcenter_2" />
+        </record>
+
+        <record model="mrp.bom.line" id="mrp.mrp_bom_line_29">
+            <field name="operation" ref="mrp.mrp_routing_workcenter_2" />
+        </record>
+
+        <record model="mrp.bom.line" id="mrp.mrp_bom_line_30">
+            <field name="operation" ref="mrp.mrp_routing_workcenter_2" />
+        </record>
+
+        <record model="mrp.bom.line" id="mrp.mrp_bom_line_31">
+            <field name="operation" ref="mrp.mrp_routing_workcenter_2" />
+        </record>
+
+    </data>
+</openerp>
diff --git a/mrp_operations_extension/demo/mrp_routing_demo.xml b/mrp_operations_extension/demo/mrp_routing_demo.xml
new file mode 100644
index 000000000..9f904c94f
--- /dev/null
+++ b/mrp_operations_extension/demo/mrp_routing_demo.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data noupdate="1">
+
+        <record model="mrp.routing.workcenter" id="mrp.mrp_routing_workcenter_0">
+            <field name="do_production" eval="True" />
+        </record>
+
+        <record model="mrp.routing.workcenter" id="mrp.mrp_routing_workcenter_1">
+            <field name="do_production" eval="True" />
+        </record>
+
+        <record model="mrp.routing.workcenter" id="mrp.mrp_routing_workcenter_2">
+            <field name="do_production" eval="True" />
+        </record>
+
+    </data>
+</openerp>
diff --git a/mrp_operations_extension/views/mrp_routing_view.xml b/mrp_operations_extension/views/mrp_routing_view.xml
index 8126a57f4..6229226d8 100644
--- a/mrp_operations_extension/views/mrp_routing_view.xml
+++ b/mrp_operations_extension/views/mrp_routing_view.xml
@@ -44,18 +44,18 @@
                 <field name="workcenter_id" position="attributes">
                     <attribute name="attrs">{'invisible': [('op_wc_lines', '!=', [])]}</attribute>
                 </field>
-                <field name="cycle_nbr" position="after">
+                <field name="cycle_nbr" position="before">
                     <field name="previous_operations_finished" />
                 </field>
+                <field name="hour_nbr" position="before">
+                    <field name="do_production" />
+                </field>
                 <field name="cycle_nbr" position="attributes">
                     <attribute name="invisible">1</attribute>
                 </field>
                 <field name="hour_nbr" position="attributes">
                     <attribute name="invisible">1</attribute>
                 </field>
-                <field name="company_id" position="before">
-                    <field name="do_production" />
-                </field>
                 <label for="note" position="before">
                     <group string="Possible workcenters">
                         <field name="op_wc_lines" nolabel="1">