From 984a1c104e617bd63ba2a72fab3d1381998fdc54 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 14 Jul 2010 18:55:25 +0530
Subject: [PATCH] [IMP] account: Improve the account_balance,general_ledger
 report

bzr revid: sbh@tinyerp.com-20100714132525-jdfllyy3zccuy6o1
---
 addons/account/report/account_balance.rml         |  2 +-
 addons/account/report/general_ledger.rml          | 15 ++++++---------
 .../account/report/general_ledger_landscape.rml   |  8 ++++----
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml
index 3434c649a49..9629c5a3095 100644
--- a/addons/account/report/account_balance.rml
+++ b/addons/account/report/account_balance.rml
@@ -212,7 +212,7 @@
     <blockTable colWidths="89.0,89.0,89.0,90.0,90.0,90.0" style="Table3a">
       <tr>
         <td>
-          <para style="terp_default_Centre_9">[[ get_fiscalyear(data['form']) ]]</para>
+          <para style="terp_default_Centre_9">[[ get_fiscalyear(data) ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_9">[[ data['form']['date_from'] ]]</para>
diff --git a/addons/account/report/general_ledger.rml b/addons/account/report/general_ledger.rml
index 1826d94019f..e4c1744c907 100644
--- a/addons/account/report/general_ledger.rml
+++ b/addons/account/report/general_ledger.rml
@@ -201,23 +201,20 @@
       <tr>
         <td><para style="terp_default_Centre_8">[[ data['form']['date_from'] ]]</para></td>
         <td><para style="terp_default_Centre_8">[[ data['form']['date_to'] ]]</para></td>
-        <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data['form']) ]]</para></td>
+        <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data) ]]</para></td>
         <td><para style="terp_default_Centre_8">[[ data['form']['sortby'] ]]</para></td>
-        <td><para style="terp_default_Centre_8">[[ get_account(data['form']) ]]</para></td>
-        <td><para style="terp_default_Centre_8">[[ get_start_period(data['form']) or removeParentNode('para') ]]</para></td>
-        <td><para style="terp_default_Centre_8">[[ get_end_period(data['form']) or removeParentNode('para') ]]</para></td>
+        <td><para style="terp_default_Centre_8">[[ get_account(data) ]]</para></td>
+        <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td>
+        <td><para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para></td>
         <td><para style="terp_default_Centre_8">[[ data['form']['filter'] ]]</para></td>
         <td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time = True) ]] </para></td>
       </tr>
     </blockTable>
 
-    <para style="terp_default_8">
+    <para>
       <font color="white"> </font>
     </para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_8">
+    <para>
       <font color="white"> </font>
     </para>
 
diff --git a/addons/account/report/general_ledger_landscape.rml b/addons/account/report/general_ledger_landscape.rml
index dd7ab1878d9..18066fdbcbe 100644
--- a/addons/account/report/general_ledger_landscape.rml
+++ b/addons/account/report/general_ledger_landscape.rml
@@ -205,11 +205,11 @@
       <tr>
         <td><para style="terp_default_Centre_8">[[ data['form']['date_from'] ]]</para></td>
         <td><para style="terp_default_Centre_8">[[ data['form']['date_to'] ]]</para></td>
-        <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data['form']) ]]</para></td>
+        <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data) ]]</para></td>
         <td><para style="terp_default_Centre_8">[[ data['form']['sortby'] ]]</para></td>
-        <td><para style="terp_default_Centre_8">[[ get_account(data['form']) ]]</para></td>
-        <td><para style="terp_default_Centre_8">[[ get_start_period(data['form']) or removeParentNode('para') ]]</para></td>
-        <td><para style="terp_default_Centre_8">[[ get_end_period(data['form']) or removeParentNode('para') ]]</para></td>
+        <td><para style="terp_default_Centre_8">[[ get_account(data) ]]</para></td>
+        <td><para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para></td>
+        <td><para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para></td>
         <td><para style="terp_default_Centre_8">[[ data['form']['filter'] ]]</para></td>
         <td><para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d %H:%M:%S'),date_time = True) ]] </para></td>
       </tr>