From ae436f9fa1eaef5c9010ae27198c8a6685b849c1 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 20 Jul 2010 14:46:27 +0530
Subject: [PATCH] [Fix] account: Improve the layout of report

bzr revid: sbh@tinyerp.com-20100720091627-0ekiktw86iyc1056
---
 addons/account/report/account_journal.rml          | 2 +-
 addons/account/report/general_ledger.rml           | 4 +++-
 addons/account/report/general_ledger_landscape.rml | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml
index 178126e2c65..ee720c04860 100644
--- a/addons/account/report/account_journal.rml
+++ b/addons/account/report/account_journal.rml
@@ -124,7 +124,7 @@
     </blockTableStyle>
  <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,0"/>
+         <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
     </blockTableStyle>    
      <blockTableStyle id="Table_Company_Name">
     </blockTableStyle>
diff --git a/addons/account/report/general_ledger.rml b/addons/account/report/general_ledger.rml
index c856c9ad6e1..bbb10a449ec 100644
--- a/addons/account/report/general_ledger.rml
+++ b/addons/account/report/general_ledger.rml
@@ -220,10 +220,11 @@
 
    <para>[[ repeatIn(objects, 'a') ]]</para>
 
-    <blockTable colWidths="80.0,80.0,80.0,110.0,80.0,100.0" style="Table2">
+    <blockTable colWidths="80.0,70.0,70.0,80.0,110.0,80.0,80.0" style="Table2">
       <tr>
       	<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">Journals</para></td>        
 		<td><para style="terp_tblheader_General_Centre">Display Account </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>
@@ -232,6 +233,7 @@
 	<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">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]] </para></td>
 		<td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='all' and 'All') or  (data['form']['display_account']=='mouvement' and 'With movements') or 'With balance is not equal to 0']]</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') ]]
diff --git a/addons/account/report/general_ledger_landscape.rml b/addons/account/report/general_ledger_landscape.rml
index 9ab73d52c35..2f0cf030044 100644
--- a/addons/account/report/general_ledger_landscape.rml
+++ b/addons/account/report/general_ledger_landscape.rml
@@ -242,7 +242,7 @@
 	<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">[[', '.join([ lt or '' for lt in get_journal(data['form']['journal_ids']) ]) ]] </para></td>
+       <td> <para style="terp_default_Centre_8">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]] </para></td>
 		<td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='bal_all' and 'All') or  (data['form']['display_account']=='bal_mouvement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
 		
         <td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] </para>