From 613a8a5814c678a6dcfdf3d94b50441a012543c2 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 15 Jul 2010 18:27:50 +0530
Subject: [PATCH] [IMP] account: Improve the general_ledger report

bzr revid: sbh@tinyerp.com-20100715125750-t34rms9n3q5zdxtt
---
 addons/account/report/common_report_header.py |  5 +-
 addons/account/report/general_ledger.py       |  3 +-
 .../report/general_ledger_landscape.rml       | 96 ++++++++++++++-----
 3 files changed, 80 insertions(+), 24 deletions(-)

diff --git a/addons/account/report/common_report_header.py b/addons/account/report/common_report_header.py
index 7dfa5925cee..0b14b35c752 100644
--- a/addons/account/report/common_report_header.py
+++ b/addons/account/report/common_report_header.py
@@ -82,7 +82,10 @@ class common_report_header(object):
 
     def _get_sortby(self, data):
         if data.get('form', False) and data['form'].get('sortby', False):
-            return data['form']['sortby']
+            if data['form']['sortby']=='sort_date':
+                return 'Date'
+            elif data['form']['sortby'] == 'sort_journal_partner':
+                return 'Journal & Partner'
         return ''
 
     def _get_filter(self, data):
diff --git a/addons/account/report/general_ledger.py b/addons/account/report/general_ledger.py
index a45791dd07d..b3d5be29848 100644
--- a/addons/account/report/general_ledger.py
+++ b/addons/account/report/general_ledger.py
@@ -72,7 +72,8 @@ class general_ledger(rml_parse.rml_parse, common_report_header):
             'get_account': self._get_account,
             'get_start_period': self.get_start_period,
             'get_end_period': self.get_end_period,
-            'get_sortby': self._get_sortby
+            'get_sortby': self._get_sortby,
+            'get_filter': self._get_filter,
         })
         self.context = context
 
diff --git a/addons/account/report/general_ledger_landscape.rml b/addons/account/report/general_ledger_landscape.rml
index 18066fdbcbe..d7f350058f0 100644
--- a/addons/account/report/general_ledger_landscape.rml
+++ b/addons/account/report/general_ledger_landscape.rml
@@ -123,6 +123,46 @@
       <lineStyle kind="LINEBELOW" colorName="#777777" start="0,0" stop="0,0"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
+      <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="LINEAFTER" 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="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="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="6,0" stop="6,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="6,0" stop="6,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="7,0" stop="7,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="7,0" stop="7,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="7,0" stop="7,0"/>     
+    </blockTableStyle>
+     <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,0"/>
+    </blockTableStyle>    
+     <blockTableStyle id="Table_Company_Name">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
@@ -188,33 +228,45 @@
       <font color="white"> </font>
     </para>
 
-    <blockTable colWidths="60.0,60.0,60.0,60.0,59.0,59.0,59.0,59.0,59.0" style="Table_Sub_Header_Content">
+      <blockTable colWidths="80.0,80.0,80.0,110.0,80.0,100.0" style="Table2">
       <tr>
-        <td><para style="terp_tblheader_General_Centre">Start Date</para></td>
-        <td><para style="terp_tblheader_General_Centre">End Date</para></td>
+      	<td><para style="terp_tblheader_General_Centre">Chat Account</para></td>        
         <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
+		<td><para style="terp_tblheader_General_Centre">Display</para></td>        
+        <td><para style="terp_tblheader_General_Centre">Filters By <font color="white">[[ get_filter(data)!='No Filter' and '' or removeParentNode('font') ]]</font><font>[[ get_filter(data) ]]</font></para></td>
          <td><para style="terp_tblheader_General_Centre">Entries Sorted By</para></td>
-        <td><para style="terp_tblheader_General_Centre">Account</para></td>
-        <td><para style="terp_tblheader_General_Centre">Start Period</para></td>
-        <td><para style="terp_tblheader_General_Centre">End Period</para></td>
-         <td><para style="terp_tblheader_General_Centre">Filters By</para></td>
         <td><para style="terp_tblheader_General_Centre">Printing Date</para></td>
       </tr>
-    </blockTable>
-    <blockTable colWidths="60.0,60.0,60.0,60.0,59.0,59.0,59.0,59.0,59.0" style="Table_Subheader_Content_detail">
-      <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) ]]</para></td>
-        <td><para style="terp_default_Centre_8">[[ data['form']['sortby'] ]]</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>
-
+	<tr>
+	   <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
+       <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data)  or removeParentNode('para') ]]</para></td>
+		<td><para style="terp_default_Centre_8">[[ data['form']['display_account'] ]]</para></td>
+        <td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] </para>
+        	<blockTable colWidths="50.0,50.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
+				<tr>
+	               <td><para style="terp_tblheader_Details_Centre">Start Date</para></td>
+	        		<td><para style="terp_tblheader_Details_Centre">End Date</para></td>        	
+	        	</tr>        	
+	        	<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>        	
+	        	</tr>
+        	</blockTable>
+        	<blockTable colWidths="50.0,50.0" style="Table3">[[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]]
+				<tr>
+			        <td><para style="terp_tblheader_Details_Centre">Start Period</para></td>
+			        <td><para style="terp_tblheader_Details_Centre">End Period</para></td>      	
+	        	</tr>        	
+	        	<tr>
+			        <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>
+	        	</tr>
+        	 </blockTable>        	 
+        	</td>
+        <td><para style="terp_default_Centre_8">[[ get_sortby(data) ]]</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">
       <font color="white"> </font>
     </para>