From e8450145b78f12cfacf25fcf61d8917bcf37865f Mon Sep 17 00:00:00 2001
From: "SAZ (OpenERP)" <>
Date: Tue, 21 Sep 2010 10:47:40 +0530
Subject: [PATCH] [IMP]: Improve 'Account Balance' report.

bzr revid: rch_open_erp-20100921051740-4ddrx1rqv9nibdgu
---
 .../report/compare_account_balance.rml        | 196 +++++++++++++++---
 1 file changed, 168 insertions(+), 28 deletions(-)

diff --git a/addons/account/report/compare_account_balance.rml b/addons/account/report/compare_account_balance.rml
index 75efb973ab7..0a1e59d2e9c 100644
--- a/addons/account/report/compare_account_balance.rml
+++ b/addons/account/report/compare_account_balance.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Account 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"/>
     </pageTemplate>
@@ -14,6 +14,24 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
+    <blockTableStyle id="Table_header_account_a">
+      <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"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
+      <blockBackground colorName="#ffffff" start="0,0" stop="0,-1"/>
+      <blockBackground colorName="#ffffff" start="1,0" stop="1,-1"/>
+      <blockBackground colorName="#ffffff" start="2,0" stop="2,-1"/>
+      <blockBackground colorName="#ffffff" start="3,0" stop="3,-1"/>
+      <blockBackground colorName="#ffffff" start="4,0" stop="4,-1"/>
+      <blockBackground colorName="#ffffff" start="5,0" stop="5,-1"/>
+      <blockBackground colorName="#ffffff" start="6,0" stop="6,-1"/>
+    </blockTableStyle>
     <blockTableStyle id="Table_header_account">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -30,6 +48,20 @@
       <blockBackground colorName="#ffffff" start="4,0" stop="4,-1"/>
       <blockBackground colorName="#ffffff" start="5,0" stop="5,-1"/>
     </blockTableStyle>
+    <blockTableStyle id="Table1a">
+      <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"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <blockBackground colorName="#ffffff" start="0,0" stop="0,-1"/>
+      <blockBackground colorName="#ffffff" start="1,0" stop="1,-1"/>
+      <blockBackground colorName="#ffffff" start="2,0" stop="2,-1"/>
+      <blockBackground colorName="#ffffff" start="3,0" stop="3,-1"/>
+      <blockBackground colorName="#ffffff" start="4,0" stop="4,-1"/>
+    </blockTableStyle>
     <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -71,6 +103,15 @@
       <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="Table6a">
+      <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"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+    </blockTableStyle>
     <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -99,6 +140,31 @@
       <blockBackground colorName="#ffffff" start="3,0" stop="3,-1"/>
       <blockBackground colorName="#ffffff" start="4,0" stop="4,-1"/>
     </blockTableStyle>
+    <blockTableStyle id="Table3a">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
+      <blockBackground colorName="#ffffff" start="0,0" stop="0,-1"/>
+      <blockBackground colorName="#ffffff" start="1,0" stop="1,-1"/>
+      <blockBackground colorName="#ffffff" start="2,0" stop="2,-1"/>
+      <blockBackground colorName="#ffffff" start="3,0" stop="3,-1"/>
+      <blockBackground colorName="#ffffff" start="4,0" stop="4,-1"/>
+      <blockBackground colorName="#ffffff" start="5,0" stop="5,-1"/>
+      <blockBackground colorName="#ffffff" start="6,0" stop="6,-1"/>
+    </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
@@ -132,10 +198,10 @@
       </tr>
     </blockTable>
     <para style="terp_header">Year : [[ y['year'] ]]</para>
-    <blockTable colWidths="57.0,214.0,54.0,46.0,57.0,52.0" style="Table_header_account">
+    <blockTable colWidths="57.0,180.0,69.0,57.0,57.0,60.0" style="Table_header_account">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">[[ data['form']['show_columns'] and 'Code' or removeParentNode('blockTable') ]]</para>
+          <para style="terp_tblheader_Details">[[ (data['form']['show_columns'] and not data['form']['format_perc']) and 'Code' or removeParentNode('blockTable') ]]</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">Account Name </para>
@@ -144,20 +210,21 @@
           <para style="terp_tblheader_Details">[[ data['form']['compare_pattern']!='none' and 'C.S.Y.T.(C./P)' or removeParentNode('para') ]]</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Debit</para>
+          <para style="terp_tblheader_Details_Right">Debit([[company.currency_id.code]])</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Credit</para>
+          <para style="terp_tblheader_Details_Right">Credit([[company.currency_id.code]])</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Balance</para>
+          <para style="terp_tblheader_Details_Right">Balance([[company.currency_id.code]])</para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="56.0,315.0,56.0,53.0" style="Table1">
+
+    <blockTable colWidths="40.0,154.0,60.0,61.0,61.0,61.0,45.0" style="Table_header_account_a">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">[[ (data['form']['show_columns'] and removeParentNode('blockTable')) or 'Code' ]]</para>
+          <para style="terp_tblheader_Details">[[ (data['form']['show_columns'] and data['form']['format_perc']) and 'Code' or removeParentNode('blockTable') ]]</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">Account Name </para>
@@ -166,13 +233,58 @@
           <para style="terp_tblheader_Details">[[ data['form']['compare_pattern']!='none' and 'C.S.Y.T.(C./P)' or removeParentNode('para') ]]</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Balance</para>
+          <para style="terp_tblheader_Details_Right">Debit([[company.currency_id.code]])</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Credit([[company.currency_id.code]])</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Balance([[company.currency_id.code]])</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right"></para>
+        </td>
+      </tr>
+    </blockTable>
+
+    <blockTable colWidths="56.0,290.0,76.0,58.0" style="Table1">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">[[ (not data['form']['show_columns'] and not data['form']['format_perc']) and 'Code' or removeParentNode('blockTable') ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Account Name </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">[[ data['form']['compare_pattern']!='none' and 'C.S.Y.T.(C./P)' or removeParentNode('para') ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Balance([[company.currency_id.code]])</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="66.0,205.0,90.0,70.0,60.0" style="Table1a">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">[[ (not data['form']['show_columns'] and data['form']['format_perc']) and 'Code' or removeParentNode('blockTable') ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Account Name </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">[[ data['form']['compare_pattern']!='none' and 'C.S.Y.T.(C./P)' or removeParentNode('para') ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Balance([[company.currency_id.code]])</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right"></para>
         </td>
       </tr>
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(get_lines(y,data['form']), 'a') ]]</para>
-      <blockTable colWidths="56.0,208.0,58.0,49.0,55.0,54.0" style="Table4">
+      <blockTable colWidths="57.0,180.0,69.0,57.0,57.0,60.0" style="Table4">
         <tr>
           <td>
             <para style="terp_default_9">[[ (data['form']['format_perc'] or not data['form']['show_columns']) and removeParentNode('blockTable') ]] <font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')]]</font>[[ a['code'] ]]</para>
@@ -184,17 +296,17 @@
             <para style="terp_default_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')]]</font>[[ a['pattern'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')]]</font>[[ a['debit'] ]]</para>
+            <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')]]</font>[[ a['debit'] ]] [[company.currency_id.symbol]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')]]</font>[[ a['credit'] ]]</para>
+            <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')]]</font>[[ a['credit'] ]] [[company.currency_id.symbol]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')]]</font>[[ a['balance'] ]]</para>
+            <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')]]</font>[[ a['balance'] ]] [[company.currency_id.symbol]]</para>
           </td>
         </tr>
       </blockTable>
-      <blockTable colWidths="56.0,153.0,55.0,54.0,54.0,56.0,54.0" style="Table2">
+      <blockTable colWidths="40.0,154.0,60.0,61.0,61.0,61.0,45.0" style="Table2">
         <tr>
           <td>
             <para style="terp_default_9">[[ (not data['form']['format_perc'] or not data['form']['show_columns']) and removeParentNode('blockTable') ]] <font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')]]</font>[[ a['code'] ]]</para>
@@ -206,20 +318,20 @@
             <para style="terp_default_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')]]</font>[[ a['pattern'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')]]</font>[[ a['debit'] ]]</para>
+            <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')]]</font>[[ a['debit'] ]] [[company.currency_id.symbol]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')]]</font>[[ a['credit'] ]]</para>
+            <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')]]</font>[[ a['credit'] ]] [[company.currency_id.symbol]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')]]</font>[[ a['balance'] ]]</para>
+            <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')]]</font>[[ a['balance'] ]] [[company.currency_id.symbol]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')]]</font>[[ a['balance_perc'] ]]</para>
           </td>
         </tr>
       </blockTable>
-      <blockTable colWidths="55.0,154.0,218.0,54.0" style="Table6">
+      <blockTable colWidths="56.0,290.0,76.0,58.0" style="Table6">
         <tr>
           <td>
             <para style="terp_default_9">[[ (data['form']['format_perc'] or data['form']['show_columns']) and removeParentNode('blockTable') ]] <font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')]]</font>[[ a['code'] ]]</para>
@@ -231,11 +343,11 @@
             <para style="terp_default_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')]]</font>[[ a['pattern'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')]]</font>[[ a['balance'] ]]</para>
+            <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')]]</font>[[ a['balance'] ]] [[company.currency_id.symbol]]</para>
           </td>
         </tr>
       </blockTable>
-      <blockTable colWidths="54.0,135.0,113.0,130.0,49.0" style="Table5">
+      <blockTable colWidths="66.0,205.0,90.0,70.0,60.0" style="Table6a">
         <tr>
           <td>
             <para style="terp_default_9">[[ (not data['form']['format_perc'] or data['form']['show_columns']) and removeParentNode('blockTable') ]]<font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')]]</font> [[ a['code'] ]]</para>
@@ -247,30 +359,58 @@
             <para style="terp_default_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')]]</font>[[ a['pattern'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')]]</font>[[ a['balance'] ]]</para>
+            <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')]]</font>[[ a['balance'] ]] [[company.currency_id.symbol]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')]]</font>[[ a['balance_perc'] ]]</para>
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_2">
-        <font color="white"> </font>
-      </para>
     </section>
-    <blockTable colWidths="54.0,135.0,113.0,130.0,49.0" style="Table3">
+    <blockTable colWidths="57.0,249.0,57.0,57.0,60.0" style="Table3">
       <tr>
         <td>
-          <para style="terp_default_9">[[ not data['form']['show_columns'] and removeParentNode('blockTable') ]] </para>
+          <para style="terp_default_9">[[ (data['form']['show_columns'] and not data['form']['format_perc']) or  removeParentNode('blockTable') ]] </para>
         </td>
         <td>
           <para style="terp_tblheader_Details">Total :</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ total_dr() ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ total_dr() ]] [[company.currency_id.symbol]]</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ total_cr() ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ total_cr() ]] [[company.currency_id.symbol]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="40.0,154.0,60.0,61.0,61.0,61.0,45.0" style="Table3a">
+      <tr>
+        <td>
+          <para style="terp_default_9">[[ (not data['form']['show_columns'] or not data['form']['format_perc']) and  removeParentNode('blockTable') ]] </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Total :</para>
+        </td>
+        <td>
+    <para style="terp_default_space">
+      <font color="white"> </font>
+    </para>
+         </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">[[ total_dr() ]] [[company.currency_id.symbol]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">[[ total_cr() ]] [[company.currency_id.symbol]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">
+            <font color="white"> </font>
+          </para>
         </td>
         <td>
           <para style="terp_default_Right_9">