From 4b9a8220e653c6fc59a0301bc7fd073935c09244 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Tue, 2 Nov 2010 18:33:52 +0530
Subject: [PATCH] [IMP]:account:improved reports for repeat the header on every
 pages and big column size for big amount.

bzr revid: apa@tinyerp.com-20101102130352-3shfayhq139vzqzm
---
 .../project/report/analytic_balance.rml       | 92 +++++++++++--------
 addons/account/project/report/cost_ledger.rml | 47 +++++++---
 .../report/inverted_analytic_balance.rml      | 26 ++++++
 .../project/report/quantity_cost_ledger.rml   | 48 +++++++---
 .../report/crossovered_analytic.rml           | 23 +++++
 5 files changed, 170 insertions(+), 66 deletions(-)

diff --git a/addons/account/project/report/analytic_balance.rml b/addons/account/project/report/analytic_balance.rml
index bbd7e409dc0..77182b5bb9f 100644
--- a/addons/account/project/report/analytic_balance.rml
+++ b/addons/account/project/report/analytic_balance.rml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Analytic Balance" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Analytic Balance.pdf">
+  <template pageSize="(595.0,842.0)" title="Analytic Balance" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+      <frame id="first" x1="31.0" y1="30.0" width="531" height="779"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -34,13 +34,13 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table3">
+    <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table2">
+    <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
@@ -88,17 +88,9 @@
     <images/>
   </stylesheet>
   <story>
-    <blockTable colWidths="482.0" style="Table_Header_analytic">
-      <tr>
-        <td>
-          <para style="terp_header_Centre">Analytic Balance - [[ company.currency_id.name ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_space">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="55.0,221.0,55.0,52.0,60.0,39.0" style="Table_Header_Tile">
+  <pto>
+  <pto_header>
+  <blockTable colWidths="57.0,192.0,71.0,71.0,71.0,71.0" style="Table_Header_Tile">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Code</para>
@@ -120,24 +112,55 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_2">
+  </pto_header>
+
+    <blockTable colWidths="532.0" style="Table_Header_analytic">
+      <tr>
+        <td>
+          <para style="terp_header_Centre">Analytic Balance - [[ company.currency_id.name ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_space">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="54.0,222.0,56.0,51.0,62.0,38.0" style="Table1">
+    <blockTable colWidths="57.0,192.0,71.0,71.0,71.0,71.0" style="Table_Header_Tile">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Code</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Account Name</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Debit</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Credit</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Balance</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Quantity</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="57.0,192.0,71.0,71.0,71.0,71.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Total</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">
-            <font color="white"></font>
+            <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'debit')) ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'debit')) ]] </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'credit')) ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'credit')) ]] </para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">[[ formatLang(sum_balance(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol]]</para>
@@ -148,8 +171,8 @@
       </tr>
     </blockTable>
     <section>
-      <para style="terp_default_8">[[ repeatIn(get_objects(data['form']['empty_acc']),'o') ]]</para>
-      <blockTable colWidths="55.0,221.0,56.0,50.0,62.0,38.0" style="Table3">
+      <para style="terp_default_2">[[ repeatIn(get_objects(data['form']['empty_acc']),'o') ]]</para>
+      <blockTable colWidths="57.0,192.0,71.0,71.0,71.0,71.0" style="Table2">
         <tr>
           <td>
             <para style="terp_default_Bold_9">[[ o['code'] ]]</para>
@@ -158,10 +181,10 @@
             <para style="terp_default_Bold_9">[[ o['complete_name'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9_Bold">[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'debit')) ]]</para>
+            <para style="terp_default_Right_9_Bold">[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'debit')) ]] </para>
           </td>
           <td>
-            <para style="terp_default_Right_9_Bold">[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'credit')) ]]</para>
+            <para style="terp_default_Right_9_Bold">[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'credit')) ]] </para>
           </td>
           <td>
             <para style="terp_default_Right_9_Bold">[[ formatLang(move_sum_balance(o['id'],data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol]]</para>
@@ -171,12 +194,9 @@
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_2">
-        <font color="white"> </font>
-      </para>
       <section>
-        <para style="terp_default_8">[[ repeatIn(lines_g(o['id'],data['form']['date1'],data['form']['date2']),'move_g') ]]</para>
-        <blockTable colWidths="55.0,222.0,56.0,49.0,63.0,37.0" style="Table2">
+        <para style="terp_default_2">[[ repeatIn(lines_g(o['id'],data['form']['date1'],data['form']['date2']),'move_g') ]]</para>
+        <blockTable colWidths="57.0,192.0,71.0,71.0,71.0,71.0" style="Table3">
           <tr>
             <td>
               <para style="terp_default_9">[[ move_g['code'] ]]</para>
@@ -188,7 +208,7 @@
               <para style="terp_default_Right_9">[[ formatLang(move_g['debit'])]] </para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(move_g['credit']) ]]</para>
+              <para style="terp_default_Right_9">[[ formatLang(move_g['credit']) ]] </para>
             </td>
             <td>
               <para style="terp_default_Right_9">[[ formatLang(move_g['balance'])]] [[ company.currency_id.symbol ]]</para>
@@ -202,21 +222,13 @@
           <font color="white"> </font>
         </para>
       </section>
-      <para style="terp_default_2">
-        <font color="white"> </font>
-      </para>
     </section>
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
     <para style="Standard">
       <font color="white"> </font>
     </para>
+    </pto>
   </story>
 </document>
\ No newline at end of file
diff --git a/addons/account/project/report/cost_ledger.rml b/addons/account/project/report/cost_ledger.rml
index a59e95724d0..90ff16be217 100644
--- a/addons/account/project/report/cost_ledger.rml
+++ b/addons/account/project/report/cost_ledger.rml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Cost Ledger" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Cost Ledger.pdf">
+  <template pageSize="(595.0,842.0)" title="Cost Ledger" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+      <frame id="first" x1="28.0" y1="30.0" width="539" height="785"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -120,7 +120,29 @@
     <images/>
   </stylesheet>
   <story>
-    <blockTable colWidths="161.0,161.0,161.0" repeatRows="1" style="Table1">
+  <pto>
+  <pto_header>
+  <blockTable colWidths="53.0,276.0,70.0,71.0,68.0" style="Table_Header_Title">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Date/Code</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">J.C. /Move name</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Debit</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Credit</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Balance</para>
+        </td>
+      </tr>
+    </blockTable>
+  </pto_header>
+    <blockTable colWidths="179.0,179.0,180.0" repeatRows="1" style="Table1">
       <tr>
         <td>
           <para style="terp_default_9">
@@ -137,7 +159,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="161.0,161.0,161.0" style="Table_Date_Sub_detail">
+    <blockTable colWidths="179.0,179.0,179.0" style="Table_Date_Sub_detail">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Period from </para>
@@ -150,7 +172,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="161.0,161.0,161.0" style="Table_Sub_Content">
+    <blockTable colWidths="179.0,179.0,179.0" style="Table_Sub_Content">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ formatLang(data['form']['date1'],date = True) ]]</para>
@@ -166,7 +188,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="63.0,249.0,57.0,57.0,57.0" style="Table_Header_Title">
+    <blockTable colWidths="53.0,276.0,70.0,71.0,68.0" style="Table_Header_Title">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Date/Code</para>
@@ -181,11 +203,11 @@
           <para style="terp_tblheader_Details_Right">Credit</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Balance</para>
+          <para style="terp_tblheader_Details_Right">Balance</para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="62.0,250.0,57.0,56.0,57.0" style="Table_Grant_Total">
+    <blockTable colWidths="56.0,273.0,70.0,70.0,70.0" style="Table_Grant_Total">
       <tr>
         <td>
           <para style="terp_default_Bold_9">Total:</para>
@@ -208,7 +230,7 @@
     </blockTable>
     <section>
       <para style="terp_default_2">[[ repeatIn(objects,'o') ]]</para>
-      <blockTable colWidths="62.0,249.0,57.0,57.0,57.0" style="Table_Account_Detail">
+      <blockTable colWidths="56.0,273.0,70.0,70.0,70.0" style="Table_Account_Detail">
         <tr>
           <td>
             <para style="terp_default_Bold_9">[[ o.code ]]</para>
@@ -229,7 +251,7 @@
       </blockTable>
       <section>
         <para style="terp_default_2">[[ repeatIn(lines_g(o.id,data['form']['date1'],data['form']['date2']),'move_g') ]]</para>
-        <blockTable colWidths="62.0,249.0,58.0,56.0,57.0" style="Table_Move_Line_Detail">
+        <blockTable colWidths="56.0,273.0,70.0,70.0,70.0" style="Table_Move_Line_Detail">
           <tr>
             <td>
               <para style="terp_default_Bold_9">[[ move_g['code'] ]]</para>
@@ -250,7 +272,7 @@
         </blockTable>
         <section>
           <para style="terp_default_2">[[ repeatIn(lines_a(move_g['id'],o.id,data['form']['date1'],data['form']['date2']),'move_a') ]]</para>
-          <blockTable colWidths="60.0,46.0,204.0,59.0,55.0,58.0" style="Table_Move_Line_Content">
+          <blockTable colWidths="56.0,56.0,217.0,70.0,70.0,70.0" style="Table_Move_Line_Content">
             <tr>
               <td>
                 <para style="terp_default_9_Italic">[[ formatLang(move_a['date'],date = True) ]]</para>
@@ -278,5 +300,6 @@
         </section>
       </section>
     </section>
+    </pto>
   </story>
 </document>
\ No newline at end of file
diff --git a/addons/account/project/report/inverted_analytic_balance.rml b/addons/account/project/report/inverted_analytic_balance.rml
index 6de2e28d46e..25a79aa63f9 100644
--- a/addons/account/project/report/inverted_analytic_balance.rml
+++ b/addons/account/project/report/inverted_analytic_balance.rml
@@ -87,6 +87,31 @@
     <images/>
   </stylesheet>
   <story>
+  <pto>
+  <pto_header>
+  <blockTable colWidths="58.0,238.0,62.0,62.0,60.0,59.0" style="Table_Header_table">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Code</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Name</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Debit</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Credit</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Balance</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Quantity</para>
+        </td>
+      </tr>
+    </blockTable>
+  </pto_header>
     <blockTable colWidths="539.0" style="Table_Title">
       <tr>
         <td>
@@ -199,5 +224,6 @@
         </para>
       </section>
     </section>
+    </pto>
   </story>
 </document>
\ No newline at end of file
diff --git a/addons/account/project/report/quantity_cost_ledger.rml b/addons/account/project/report/quantity_cost_ledger.rml
index 68e391223b4..8d83b9512ab 100644
--- a/addons/account/project/report/quantity_cost_ledger.rml
+++ b/addons/account/project/report/quantity_cost_ledger.rml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Cost Ledger" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Cost Ledger.pdf">
+  <template pageSize="(595.0,842.0)" title="Cost Ledger" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+      <frame id="first" x1="30.0" y1="29.0" width="534" height="783"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -117,7 +117,26 @@
     <images/>
   </stylesheet>
   <story>
-    <blockTable colWidths="161.0,161.0,161.0" repeatRows="1" style="Table_Header_Detail">
+  <pto>
+  <pto_header>
+  <blockTable colWidths="57.0,322.0,85.0,71.0" style="Table_Header_Move_Line">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Code/Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">J.C./Move name</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Quantity</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Total</para>
+        </td>
+      </tr>
+    </blockTable>
+  </pto_header>
+    <blockTable colWidths="178.0,178.0,178.0" repeatRows="1" style="Table_Header_Detail">
       <tr>
         <td>
           <para style="terp_default_9">
@@ -134,7 +153,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="161.0,161.0,161.0" style="Table_Date_Detail">
+    <blockTable colWidths="178.0,178.0,178.0" style="Table_Date_Detail">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Period from</para>
@@ -147,7 +166,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="161.0,161.0,161.0" style="Table_Date_Content">
+    <blockTable colWidths="178.0,178.0,178.0" style="Table_Date_Content">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ formatLang(data['form']['date1'],date = True) ]]</para>
@@ -166,7 +185,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="57.0,288.0,77.0,60.0" style="Table_Header_Move_Line">
+    <blockTable colWidths="57.0,322.0,85.0,71.0" style="Table_Header_Move_Line">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Code/Date</para>
@@ -175,14 +194,14 @@
           <para style="terp_tblheader_Details">J.C./Move name</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">Quantity</para>
+          <para style="terp_tblheader_Details_Centre">Quantity</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Total</para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="57.0,288.0,77.0,60.0" style="Table_Final_Total">
+    <blockTable colWidths="57.0,322.0,85.0,71.0" style="Table_Final_Total">
       <tr>
         <td>
           <para style="terp_default_Bold_9">Total:</para>
@@ -203,8 +222,8 @@
       </tr>
     </blockTable>
     <section>
-      <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
-      <blockTable colWidths="58.0,287.0,78.0,59.0" style="Table_Account_Detail">
+      <para style="terp_default_2">[[ repeatIn(objects,'o') ]]</para>
+      <blockTable colWidths="57.0,322.0,85.0,71.0" style="Table_Account_Detail">
         <tr>
           <td>
             <para style="terp_default_Bold_9">[[ o.code ]]<font face="Helvetica" size="10.0"/></para>
@@ -221,8 +240,8 @@
         </tr>
       </blockTable>
       <section>
-        <para style="terp_default_8">[[ repeatIn(lines_g(o.id,data['form']['date1'],data['form']['date2'],data['form']['journal']),'move_g') ]]</para>
-        <blockTable colWidths="58.0,365.0,59.0" style="Table_Analytical_Detail">
+        <para style="terp_default_2">[[ repeatIn(lines_g(o.id,data['form']['date1'],data['form']['date2'],data['form']['journal']),'move_g') ]]</para>
+        <blockTable colWidths="57.0,407.0,71.0" style="Table_Analytical_Detail">
           <tr>
             <td>
               <para style="terp_default_Bold_9">[[ move_g['code'] ]] </para>
@@ -235,7 +254,7 @@
             </td>
           </tr>
         </blockTable>
-        <blockTable colWidths="59.0,32.0,332.0,59.0" style="Table_Move_Line_Content">
+        <blockTable colWidths="57.0,71.0,336.0,71.0" style="Table_Move_Line_Content">
           <tr>
             <td>
               <para style="terp_default_9_Italic">[[ repeatIn(lines_a(move_g['id'],o.id,data['form']['date1'],data['form']['date2'],data['form']['journal']),'move_a') ]]</para>
@@ -257,5 +276,6 @@
         </para>
       </section>
     </section>
+    </pto>
   </story>
 </document>
\ No newline at end of file
diff --git a/addons/account_analytic_plans/report/crossovered_analytic.rml b/addons/account_analytic_plans/report/crossovered_analytic.rml
index 1abde7093b8..0292522206d 100644
--- a/addons/account_analytic_plans/report/crossovered_analytic.rml
+++ b/addons/account_analytic_plans/report/crossovered_analytic.rml
@@ -133,6 +133,28 @@
     <images/>
   </stylesheet>
   <story>
+  <pto>
+  <pto_header>
+  <blockTable colWidths="292.0,63.0,57.0,71.0,57.0" repeatRows="1" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Account Name</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Code</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Quantity</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Amount</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Percentage</para>
+        </td>
+      </tr>
+    </blockTable>
+  </pto_header>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
@@ -277,5 +299,6 @@
         <font color="white"> </font>
       </para>
     </section>
+    </pto>
   </story>
 </document>
\ No newline at end of file