diff --git a/addons/mrp/report/order.py b/addons/mrp/report/order.py
index 1d801b3aa2e..98f4bf1c0fb 100644
--- a/addons/mrp/report/order.py
+++ b/addons/mrp/report/order.py
@@ -39,4 +39,4 @@ class order(report_sxw.rml_parse):
         })
 
 
-report_sxw.report_sxw('report.mrp.production.order','mrp.production','addons/mrp/report/order.rml',parser=order)
+report_sxw.report_sxw('report.mrp.production.order','mrp.production','addons/mrp/report/order.rml',parser=order, header=2)
diff --git a/addons/mrp/report/order.rml b/addons/mrp/report/order.rml
index cc1b0bf34b3..35a7351371f 100644
--- a/addons/mrp/report/order.rml
+++ b/addons/mrp/report/order.rml
@@ -3,6 +3,36 @@
   <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>
@@ -13,42 +43,80 @@
     <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <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="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+      <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">
       <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="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+      <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="Table3">
+    <blockTableStyle id="Table4">
       <blockAlignment value="LEFT"/>
+      	<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-Bold" fontSize="16.0" leading="20"/>
-    <paraStyle name="P2" fontName="Helvetica" fontSize="16.0" leading="20"/>
-    <paraStyle name="P3" fontName="Helvetica"/>
-    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="11.0" leading="14"/>
-    <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="LEFT"/>
-    <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="RIGHT"/>
-    <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="11.0" leading="14"/>
-    <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="9.0" leading="11"/>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="16.0" leading="20"/>
+	<paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="9.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="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="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" fontSize="10.0" leading="13" alignment="LEFT"/>
-    <paraStyle name="P11" fontName="Helvetica" fontSize="10.0" leading="13" alignment="RIGHT"/>
-    <paraStyle name="P12" fontName="Helvetica" alignment="LEFT"/>
-    <paraStyle name="P13" fontName="Helvetica-Oblique" fontSize="9.0" leading="11"/>
-    <paraStyle name="P14" fontName="Helvetica" fontSize="9.0" leading="11"/>
-    <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="LEFT"/>
-    <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER"/>
-    <paraStyle name="P17" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT"/>
-    <paraStyle name="P18" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="3.0"/>
+    <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="P12" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER"/>
+    <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="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="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"/>
@@ -60,76 +128,89 @@
   </stylesheet>
   <images/>
   <story>
-    <para style="P14">[[ repeatIn(objects,'o') ]] </para>
-    <para style="P13">
-      <font color="white"> </font>
-    </para>
-    <para style="P14">
-      <font color="white"> </font>
-    </para>
-    <para style="P1">Production Order N° : [[ o.name ]]</para>
-    <para style="P2">
-      <font color="white"> </font>
-    </para>
-    <para style="P18">Printing date : [[ time.strftime('%d/%m/%Y') ]]</para>
-    <para style="P18">Partner Order reference : [[ o.sale_ref or ' ' ]]</para>
-    <para style="P18">SO number : [[ o.sale_name or '' ]]</para>
-    <para style="P3">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="130.0,313.0,85.0" repeatRows="1" style="Table1">
-      <tr>
-        <td>
-          <para style="P4">Product Name</para>
-        </td>
-        <td>
-          <para style="P5">Product Description</para>
-        </td>
-        <td>
-          <para style="P6">Qty</para>
-        </td>
-      </tr>
-    </blockTable>
-    <section>
-      <blockTable colWidths="130.0,312.0,86.0" style="Table2">
-        <tr>
-          <td>
-            <para style="P10">[[ '['+ o.product_id.code +']' ]] [[ o.product_id.name ]]</para>
-          </td>
-          <td>
-            <para style="P10">[[ o.product_id.description ]]</para>
-          </td>
-          <td>
-            <para style="P11">[[ '%.2f' % o.product_qty ]] [[ o.product_uom.name ]]</para>
-          </td>
-        </tr>
-      </blockTable>
-    </section>
+    <para style="P8">[[ repeatIn(objects,'o') ]] </para>
     <para style="P7">
       <font color="white"> </font>
     </para>
     <para style="P8">
-      <font color="white"> .........</font>
-      <font color="white"> .........</font>
+      <font color="white"> </font>
     </para>
-    <blockTable colWidths="86.0,16.0,425.0" style="Table3">
+    <para style="terp_header">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">
       <tr>
         <td>
-          <para style="P15">Planned Date </para>
+          <para style="P13">Printing date</para>
         </td>
         <td>
-          <para style="P16">:</para>
+          <para style="P14">Planned Date </para>
         </td>
         <td>
-          <para style="P15">[[ time.strftime('%d/%m/%Y', time.strptime(o.date_planned, '%Y-%m-%d %H:%M:%S')) ]]</para>
-          <para style="P9">
-            <font color="white"> </font>
-          </para>
+          <para style="P20">Partner Ref</para>
+        </td>
+        <td>
+          <para style="P20">SO Number</para>
+        </td>
+        <td>
+          <para style="P20">Product Name</para>
         </td>
       </tr>
     </blockTable>
-    <para style="P12">
-      <font face="Times-Roman"/>
+    <section>
+      <blockTable colWidths="74.0,88.0,78.0,89.0,199.0" style="Table2">
+        <tr>
+          <td>
+            <para style="P12">[[ time.strftime('%d/%m/%Y') ]]</para>
+          </td>
+          <td>
+            <para style="P15">[[ time.strftime('%d/%m/%Y', time.strptime(o.date_planned, '%Y-%m-%d %H:%M:%S')) ]]</para>
+          </td>
+          <td>
+            <para style="P12">[[ o.sale_ref or ' ' ]]</para>
+          </td>
+          <td>
+            <para style="P12">[[ o.sale_name or '' ]]</para>
+          </td>
+          <td>
+            <para style="P24">[[ '['+ o.product_id.code +']' ]] [[ o.product_id.name ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <para style="P2">[[ o.product_id.description ]]</para>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="185.0,342.0" style="Table4">
+      <tr>
+        <td>
+          <para style="P21">Product </para>
+        </td>
+        <td>
+          <para style="P18">Qty</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>
+        </td>
+        <td>
+          <para style="P5">[[ '%.2f' % line.product_qty ]] [[line.product_uom.name]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P2">
+      <font color="white"> .........</font>
+      <font color="white"> .........</font>
+    </para>
+    <para style="P17">
+      <font color="white"> </font>
     </para>
   </story>
 </document>