diff --git a/addons/account_analytic_analysis/report/analytic_account.rml b/addons/account_analytic_analysis/report/analytic_account.rml
index 3b6e3e8dae2..25054e5563b 100644
--- a/addons/account_analytic_analysis/report/analytic_account.rml
+++ b/addons/account_analytic_analysis/report/analytic_account.rml
@@ -23,11 +23,40 @@
       <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
@@ -43,10 +72,19 @@
       <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,1" stop="0,1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,1" stop="1,1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,1" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,1" stop="2,1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,1" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,1" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,1" stop="3,1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
@@ -81,38 +119,6 @@
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table7">
-      <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"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table5">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table8">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table9">
-      <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="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table4">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-    </blockTableStyle>
     <blockTableStyle id="Table11">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -125,10 +131,14 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="13.0" leading="16" alignment="JUSTIFY"/>
-    <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P4" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="JUSTIFY" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P6" fontName="Helvetica"/>
+    <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P8" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -173,7 +183,7 @@
       <para style="terp_header_Centre">
         <font color="white"> </font>
       </para>
-      <blockTable colWidths="120.0,120.0,120.0,121.0" style="Table10">
+      <blockTable colWidths="80.0,80.0,80.0,80.0,80.0,80.0" style="Table10">
         <tr>
           <td>
             <para style="terp_tblheader_Details_Centre">Project Name</para>
@@ -187,9 +197,15 @@
           <td>
             <para style="terp_tblheader_Details_Centre">Code/Refrence</para>
           </td>
+          <td>
+            <para style="terp_tblheader_Details">Timesheet Invoice Ratio</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details">Pricelist</para>
+          </td>
         </tr>
       </blockTable>
-      <blockTable colWidths="120.0,120.0,120.0,121.0" style="Table1">
+      <blockTable colWidths="80.0,80.0,80.0,80.0,80.0,80.0" style="Table1">
         <tr>
           <td>
             <para style="terp_default_Centre_8">[[ account.name ]]</para>
@@ -203,44 +219,54 @@
           <td>
             <para style="terp_default_Centre_8">[[ account.code ]]</para>
           </td>
+          <td>
+            <para style="terp_default_8">[[ account.to_invoice.name ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_8">[[ account.pricelist_id.name ]]</para>
+          </td>
         </tr>
       </blockTable>
-      <para style="Standard">
+      <para style="P6">
         <font color="white"> </font>
       </para>
-      <blockTable colWidths="141.0,75.0,68.0,82.0,116.0" style="Table3">
+      <blockTable colWidths="121.0,110.0,126.0,124.0" style="Table3">
         <tr>
           <td>
-            <para style="terp_tblheader_Details">Invoicing</para>
+            <para style="P3">Date Start</para>
           </td>
           <td>
-            <para style="P1">
-              <font color="white"> </font>
-            </para>
+            <para style="P5">Date End</para>
           </td>
           <td>
-            <para style="P1">
-              <font color="white"> </font>
-            </para>
+            <para style="P5">Maximum Time</para>
           </td>
           <td>
-            <para style="P1">
-              <font color="white"> </font>
-            </para>
+            <para style="P5">Remaining Time</para>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <para style="P7">[[ account.date_start ]]</para>
           </td>
           <td>
-            <para style="P1">
-              <font color="white"> </font>
-            </para>
+            <para style="P7">[ account.date ]]</para>
+          </td>
+          <td>
+            <para style="P7">[[ account.quantity_max ]]</para>
+          </td>
+          <td>
+            <para style="P7">[[ account.remaining_hours ]]</para>
           </td>
         </tr>
       </blockTable>
+      <para style="P6">
+        <font color="white"> </font>
+      </para>
       <blockTable colWidths="141.0,75.0,69.0,82.0,115.0" style="Table6">
         <tr>
           <td>
-            <para style="P1">
-              <font color="white"> </font>
-            </para>
+            <para style="P4">Invoicing</para>
           </td>
           <td>
             <para style="terp_tblheader_Details_Centre">Total Cost</para>
@@ -262,16 +288,16 @@
             <para style="terp_default_8">Fix Price Invoices</para>
           </td>
           <td>
-            <para style="terp_default_8">[[ account.amount_max ]]</para>
+            <para style="terp_default_Centre_8">[[ account.amount_max ]]</para>
           </td>
           <td>
-            <para style="terp_default_8">[[ account.so_invoiced ]]</para>
+            <para style="terp_default_Centre_8">[[ account.ca_invoiced ]]</para>
           </td>
           <td>
-            <para style="terp_default_8">[[ account.remaining_invoiced ]]</para>
+            <para style="terp_default_Centre_8">[[ account.remaining_ca ]]</para>
           </td>
           <td>
-            <para style="terp_default_8">[[ account.so_toinvoice ]]</para>
+            <para style="terp_default_Centre_8">[[ account.ca_to_invoice ]]</para>
           </td>
         </tr>
         <tr>
@@ -279,16 +305,16 @@
             <para style="terp_default_8">Invoice on Timesheet</para>
           </td>
           <td>
-            <para style="terp_default_8">[[ account.timesheet_max ]]</para>
+            <para style="terp_default_Centre_8">[[ account.quantity_max]]</para>
           </td>
           <td>
-            <para style="terp_default_8">[[ account.timesheet_invoiced ]]</para>
+            <para style="terp_default_Centre_8">[[ account.hours_qtt_invoiced ]]</para>
           </td>
           <td>
-            <para style="terp_default_8">[[ account.remaining_timesheet ]]</para>
+            <para style="terp_default_Centre_8">[[ account.remaining_hours ]]</para>
           </td>
           <td>
-            <para style="terp_default_8">[[ account.timesheet_toinvoice ]]</para>
+            <para style="terp_default_Centre_8">[[ account.hours_qtt_non_invoiced ]]</para>
           </td>
         </tr>
         <tr>
@@ -296,24 +322,16 @@
             <para style="terp_default_8">Charge Expenses</para>
           </td>
           <td>
-            <para style="terp_default_8">
-              <font color="white"> </font>
-            </para>
+            <para style="terp_default_Centre_8">[[account.expense_max]]</para>
           </td>
           <td>
-            <para style="terp_default_8">
-              <font color="white"> </font>
-            </para>
+            <para style="terp_default_Centre_8">[[account.expense_invoiced]]</para>
           </td>
           <td>
-            <para style="terp_default_8">
-              <font color="white"> </font>
-            </para>
+            <para style="terp_default_Centre_8">[[account.remaining_expense]]</para>
           </td>
           <td>
-            <para style="terp_default_8">
-              <font color="white"> </font>
-            </para>
+            <para style="terp_default_Centre_8">[[account.expense_to_invoice]]</para>
           </td>
         </tr>
         <tr>
@@ -321,119 +339,39 @@
             <para style="terp_default_8">Total</para>
           </td>
           <td>
-            <para style="terp_default_8">[[ account.total_max ]]</para>
+            <para style="terp_default_Centre_8">[[ account.est_total ]]</para>
           </td>
           <td>
-            <para style="terp_default_8">[[ account.total_invoiced ]]</para>
+            <para style="terp_default_Centre_8">[[ account.total_invoiced ]]</para>
           </td>
           <td>
-            <para style="terp_default_8">[[ account.total_remaining ]]</para>
+            <para style="terp_default_Centre_8">[[ account.remaining_total ]]</para>
           </td>
           <td>
-            <para style="terp_default_8">[[ account.total_toinvoice ]]</para>
+            <para style="terp_default_Centre_8">[[ account.toinvoice_total ]]</para>
           </td>
         </tr>
       </blockTable>
       <para style="Standard">
         <font color="white"> </font>
       </para>
-      <blockTable colWidths="241.0,241.0" style="Table7">
-        <tr>
-          <td>
-            <para style="terp_tblheader_Details">Timesheet Invoice Ratio</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details">Pricelist</para>
-          </td>
-        </tr>
-      </blockTable>
-      <blockTable colWidths="241.0,241.0" style="Table5">
-        <tr>
-          <td>
-            <para style="terp_default_8">[[ account.to_invoice.name ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_8">[[ account.pricelist_id.name ]] </para>
-          </td>
-        </tr>
-      </blockTable>
-      <para style="terp_default_1">
-        <font color="white"> </font>
-      </para>
-      <blockTable colWidths="120.0,120.0,120.0,121.0" style="Table8">
-        <tr>
-          <td>
-            <para style="terp_tblheader_Details">Validity</para>
-          </td>
-          <td>
-            <para style="P2">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="P2">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="P2">
-              <font color="white"> </font>
-            </para>
-          </td>
-        </tr>
-      </blockTable>
-      <blockTable colWidths="120.0,120.0,120.0,121.0" style="Table9">
-        <tr>
-          <td>
-            <para style="terp_tblheader_General_Centre">Date Start</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_General_Centre">Date End</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_General_Centre">Maximum Time</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_General_Centre">Remaining Time</para>
-          </td>
-        </tr>
-      </blockTable>
-      <blockTable colWidths="120.0,120.0,120.0,121.0" style="Table4">
-        <tr>
-          <td>
-            <para style="terp_default_Centre_8">[[ account.date_start ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Centre_8">[[ account.date ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Centre_8">[[ account.quantity_max ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Centre_8">[[ account.remaining_hours ]]</para>
-          </td>
-        </tr>
-      </blockTable>
-      <para style="terp_default_1">
-        <font color="white"> </font>
-      </para>
       <blockTable colWidths="120.0,120.0,120.0,121.0" style="Table11">
         <tr>
           <td>
             <para style="terp_tblheader_Details">Terms &amp; Conditions</para>
           </td>
           <td>
-            <para style="P2">
+            <para style="P1">
               <font color="white"> </font>
             </para>
           </td>
           <td>
-            <para style="P2">
+            <para style="P1">
               <font color="white"> </font>
             </para>
           </td>
           <td>
-            <para style="P2">
+            <para style="P1">
               <font color="white"> </font>
             </para>
           </td>
@@ -442,8 +380,8 @@
       <blockTable colWidths="482.0" style="Table13">
         <tr>
           <td>
-            <para style="P4">[[ account.description ]]</para>
-            <para style="P4">
+            <para style="P2">[[ account.description ]]</para>
+            <para style="P2">
               <font color="white"> </font>
             </para>
           </td>