diff --git a/addons/mrp/report/order.rml b/addons/mrp/report/order.rml
index 341793ee79d..f920a71337b 100644
--- a/addons/mrp/report/order.rml
+++ b/addons/mrp/report/order.rml
@@ -3,36 +3,6 @@
   <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="34.0" y1="42.0" width="527" height="758"/>
-      	<header>
-			<pageGraphics>
-				<!--logo-->
-				<!--<fill color="darkblue"/>-->
-				<!--<stroke color="darkblue"/>-->
-
-				<!--TITLE COMPANY-->
-				<!-- <drawString x="4.6cm" y="28.7cm">[[ company.partner_id.name ]]</drawString> -->
-
-				<setFont name="Helvetica-Bold" size="9"/>
-
-
-				<!--COL 1-->
-				<drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString>
-				<drawRightString x="20cm" y="28.1cm">Analytic Check</drawRightString>
-
-				<!-- Header -->
-
-
-				<setFont name="Helvetica" size="9"/>
-				<drawString x="1.0cm" y="1cm"> [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]]</drawString>
-				<drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
-				<!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
-
-
-			    <lineMode width="0.7"/>
-				<lines>1cm 27.7cm 20cm 27.7cm</lines>
-				<setFont name="Helvetica" size="8"/>
-			</pageGraphics>
-			</header>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -40,7 +10,75 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
     <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
@@ -60,7 +98,7 @@
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table2">
+    <blockTableStyle id="Table7">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
@@ -82,50 +120,48 @@
     </blockTableStyle>
     <blockTableStyle id="Table4">
       <blockAlignment value="LEFT"/>
-      	<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/>
+      <blockValign value="TOP"/>
+       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/>
        <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
        <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,2" stop="1,2"/>
        <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-      <blockValign value="TOP"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-
-    <paraStyle name="P1" fontName="Helvetica" fontSize="16.0" leading="20"/>
-	<paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="8.0" leading="11"/>
-    <paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11"/>
-    <paraStyle name="P4" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
+    <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="16.0" leading="20"/>
+    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="9.0" leading="11"/>
+    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT"/>
+    <paraStyle name="P4" fontName="Helvetica" fontSize="9.0" leading="11"/>
     <paraStyle name="P5" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT"/>
-    <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="LEFT"/>
+    <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER"/>
     <paraStyle name="P7" fontName="Helvetica-Oblique" fontSize="9.0" leading="11"/>
     <paraStyle name="P8" fontName="Helvetica" fontSize="9.0" leading="11"/>
-
-    <paraStyle name="P9" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="LEFT"/>
-
-    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER"/>
-    <paraStyle name="P11" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT"/>
+    <paraStyle name="P9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER"/>
+    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER"/>
+    <paraStyle name="P11" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER"/>
     <paraStyle name="P12" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER"/>
-	<paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER"/>
-    <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER"/>
-    <paraStyle name="P15" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER"/>
-    <paraStyle name="P16" fontName="Helvetica" fontSize="9.0" leading="11"/>
+    <paraStyle name="P13" fontName="Helvetica" alignment="LEFT"/>
+    <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT"/>
+    <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER"/>
+    <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER"/>
     <paraStyle name="P17" fontName="Helvetica" alignment="LEFT"/>
     <paraStyle name="P18" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT"/>
-    <paraStyle name="P19" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P20" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER"/>
-    <paraStyle name="P21" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P22" fontName="Helvetica-Bold" fontSize="9.0" leading="11"/>
-    <paraStyle name="P23" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P24" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER"/>
-    <paraStyle name="P25" fontName="Helvetica-Bold" fontSize="16.0" leading="20"/>
-
+    <paraStyle name="P19" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER"/>
+    <paraStyle name="P20" fontName="Helvetica" fontSize="9.0" leading="11"/>
+    <paraStyle name="P21" fontName="Helvetica" fontSize="9.0" leading="11"/>
+    <paraStyle name="P22" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER"/>
+    <paraStyle name="P23" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER"/>
+    <paraStyle name="P24" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT"/>
+    <paraStyle name="P25" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER"/>
+    <paraStyle name="P26" fontName="Helvetica-Bold" fontSize="9.0" leading="11"/>
+    <paraStyle name="P27" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT"/>
+    <paraStyle name="P28" fontName="Helvetica" fontSize="9.0" leading="11"/>
+    <paraStyle name="P29" fontName="Helvetica-Bold" fontSize="16.0" leading="20"/>
+    <paraStyle name="P30" fontName="Helvetica" fontSize="16.0" leading="20"/>
     <paraStyle name="Standard" fontName="Times-Roman"/>
     <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-	<paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Table Contents" fontName="Times-Roman"/>
     <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
@@ -138,91 +174,178 @@
     <para style="P7">
       <font color="white"> </font>
     </para>
+    <para style="P7">
+      <font color="white"> </font>
+    </para>
     <para style="P8">
       <font color="white"> </font>
     </para>
-    <para style="terp_header">Production Order N° : [[ o.name ]]</para>
+    <para style="P1">Production Order N° : [[ o.name ]]</para>
     <para style="P1">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="74.0,88.0,78.0,89.0,199.0" repeatRows="1" style="Table1">
-
+    <blockTable colWidths="193.0,106.0,96.0,132.0" style="Table3">
       <tr>
         <td>
-
-          <para style="terp_tblheader_General_Centre">Printing date</para>
+          <para style="P10">Product </para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Planned Date </para>
+          <para style="P11">Quantity</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Partner Ref</para>
+          <para style="P6">Priority</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">SO Number</para>
+          <para style="P6">Note</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="193.0,106.0,96.0,132.0" style="Table5">
+      <tr>
+        <td>
+          <para style="P22">[[ '['+ o.product_id.code +']' ]] [[ o.product_id.name ]]</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Product Name</para>
-
+          <para style="P22">[['%.2f' % o.product_qty or '0.00' ]]</para>
+        </td>
+        <td>
+          <para style="P22">[[o.priority or '']]</para>
+        </td>
+        <td>
+          <para style="P22">[[ o.product_id.description or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P30">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="128.0,137.0,132.0,131.0" repeatRows="1" style="Table1">
+      <tr>
+        <td>
+          <para style="P10">Printing date</para>
+        </td>
+        <td>
+          <para style="P11">Planned Date </para>
+        </td>
+        <td>
+          <para style="P6">Partner Ref</para>
+        </td>
+        <td>
+          <para style="P6">SO Number</para>
         </td>
       </tr>
     </blockTable>
     <section>
-      <blockTable colWidths="74.0,88.0,78.0,89.0,199.0" style="Table2">
+      <blockTable colWidths="128.0,137.0,132.0,131.0" style="Table2">
         <tr>
           <td>
-
-            <para style="terp_default_Centre_8">[[ time.strftime('%d/%m/%Y') ]]</para>
+            <para style="P9">[[ time.strftime('%d/%m/%Y') ]]</para>
           </td>
           <td>
-            <para style="terp_default_Centre_8">[[ time.strftime('%d/%m/%Y', time.strptime(o.date_planned, '%Y-%m-%d %H:%M:%S')) ]]</para>
+            <para style="P12">[[ time.strftime('%d/%m/%Y', time.strptime(o.date_planned, '%Y-%m-%d %H:%M:%S')) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Centre_8">[[ o.sale_ref or ' ' ]]</para>
+            <para style="P9">[[ o.sale_ref or ' ' ]]</para>
           </td>
           <td>
-            <para style="terp_default_Centre_8">[[ o.sale_name or '' ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Centre_8">[[ '['+ o.product_id.code +']' ]] [[ o.product_id.name ]]</para>
-
+            <para style="P9">[[ o.sale_name or '' ]]</para>
           </td>
         </tr>
       </blockTable>
     </section>
-
     <para style="P2">
       <font color="white"> </font>
     </para>
-    <para style="P2">[[ o.product_id.description ]]</para>
+    <para style="P2">Work Orders</para>
     <para style="P2">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="185.0,342.0" style="Table4">
+    <blockTable colWidths="80.0,155.0,105.0,95.0,95.0" style="Table6">
       <tr>
         <td>
-          <para style="P21">Product </para>
+          <para style="P10">Sequence</para>
         </td>
         <td>
-          <para style="P18">Qty</para>
+          <para style="P11">Name </para>
+        </td>
+        <td>
+          <para style="P6">WorkCenter</para>
+        </td>
+        <td>
+          <para style="P6">No. Of Cycles</para>
+        </td>
+        <td>
+          <para style="P6">No. Of Hours</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="80.0,155.0,105.0,95.0,95.0" style="Table7">
+      <tr>
+        <td>
+          <para style="P22">[[ repeatIn(o.workcenter_lines,'line2') ]]</para>
+          <para style="P22">[[ line2.sequence ]]</para>
+        </td>
+        <td>
+          <para style="P22">[[ line2.name ]]</para>
+        </td>
+        <td>
+          <para style="P22">[[ line2.workcenter_id.name ]]</para>
+        </td>
+        <td>
+          <para style="P22">[[ line2.cycle or '0.00' ]]</para>
+        </td>
+        <td>
+          <para style="P22">[[ line2.hour or '0.00' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <para style="P2">Bill Of Material </para>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="181.0,99.0,124.0,124.0" style="Table4">
+      <tr>
+        <td>
+          <para style="P3">Product </para>
+        </td>
+        <td>
+          <para style="P14">Qty</para>
+        </td>
+        <td>
+          <para style="P19">Source Location</para>
+        </td>
+        <td>
+          <para style="P19">Destination Location</para>
         </td>
       </tr>
       <tr>
         <td>
-          <para style="P3">[[ repeatIn(o.move_lines,'line') ]]</para>
-          <para style="P3">[[ '['+line.product_id.code +']' ]] [[ line.product_id.name ]]</para>
+          <para style="P4">[[ repeatIn(o.move_lines,'line') ]]</para>
+          <para style="P4">[[ '['+line.product_id.code +']' ]][[ line.product_id.name ]]</para>
         </td>
         <td>
           <para style="P5">[[ '%.2f' % line.product_qty ]] [[line.product_uom.name]]</para>
         </td>
+        <td>
+          <para style="P25">[[ line.location_id.name ]]</para>
+        </td>
+        <td>
+          <para style="P25">[[ line.location_dest_id.name ]]</para>
+        </td>
       </tr>
     </blockTable>
     <para style="P2">
       <font color="white"> .........</font>
       <font color="white"> .........</font>
     </para>
-    <para style="P17">
+    <para style="P13">
+      <font color="white"> </font>
+    </para>
+    <para style="P13">
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>
\ No newline at end of file