From 6e95d310801867477f532bba23ce97932e2cd59b Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 19 Jul 2010 20:35:52 +0530
Subject: [PATCH] [IMP] account : Improve the account_journal report

bzr revid: sbh@tinyerp.com-20100719150552-gxn0c196ol66krov
---
 addons/account/report/account_journal.rml | 40 +++++++++++++++++++++--
 1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml
index 43abea5fc5d..26067043ed6 100644
--- a/addons/account/report/account_journal.rml
+++ b/addons/account/report/account_journal.rml
@@ -205,7 +205,8 @@
     </para>
       <blockTable colWidths="80.0,80.0,80.0,120.0,70.0,100.0" style="Table2">
       <tr>
-      	<td><para style="terp_tblheader_General_Centre">Chat Account</para></td>        
+      	<td><para style="terp_tblheader_General_Centre"><font> Chat Account[[ data['model']=='account.journal.period' and removeParentNode('font')  ]]</font>
+      	<font> Company [[ data['model']=='account.journal.period' or removeParentNode('font') and '' ]]</font></para></td>        
         <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
 		<td><para style="terp_tblheader_General_Centre">Journal</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) or '' ]]</font></para></td>
@@ -213,8 +214,8 @@
         <td><para style="terp_tblheader_General_Centre">Printing Date</para></td>
       </tr>
 	<tr>
-	   <td><para style="terp_default_Centre_8">[[ get_account(data) or ''  ]]</para></td>
-       <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data)  or '' ]]</para></td>
+	   <td><para style="terp_default_Centre_8">[[ get_account(data) or  data['model']=='account.journal.period' and o.company_id.name  ]]</para></td>
+       <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data) or  data['model']=='account.journal.period' and o.fiscalyear_id.name ]]</para></td>
 		<td><para style="terp_default_Centre_8">[[o.journal_id.name  ]]</para></td>
         <td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] </para>
         	<blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
@@ -281,6 +282,39 @@
       </tr>
     </blockTable>
     
+      <blockTable colWidths="40.0,65.0,50.0,62.0,174.0,57.0,61.0,40.0" style="Table1" repeatRows="1">[[ data['model'] =='account.journal.period' or removeParentNode('blockTable') ]]
+      <tr>
+        <td><para style="P10a">Date</para></td>
+        <td><para style="P10">Voucher No</para></td>
+        <td><para style="P10">A/c No.</para></td>
+        <td><para style="P10a">Third party</para></td>
+        <td><para style="P10a">Entry label</para></td>
+        <td><para style="P10b">Debit</para></td>
+        <td><para style="P10b">Credit</para></td>
+        <td><para style="P10b">Balance</para></td>
+      </tr>
+       <tr>
+        <td><para style="P11">[[o.period_id.name ]]</para></td>
+        <td><para style="P11a">[[ o.journal_id.code ]]</para></td>
+        <td><para style="P11"><font color="white"></font></para></td>
+        <td><para style="P11"><font color="white"></font></para></td>
+        <td><para style="P11"><font color="white"></font></para></td>
+        <td><para style="P12"><u>[[ formatLang(sum_debit(o.period_id.id, o.journal_id.id)) ]]</u></para></td>
+        <td><para style="P12"><u>[[ formatLang(sum_credit(o.period_id.id, o.journal_id.id)) ]]</u></para></td>
+        <td> <para style="P12"><u>[[ formatLang((sum_debit(o.period_id.id, o.journal_id.id) - sum_credit(o.period_id.id, o.journal_id.id))) ]]</u></para></td>
+      </tr>
+      <tr>
+        <td><para style="terp_default_8">[[ repeatIn(lines(o.period_id.id, o.journal_id.id), 'line') ]]</para><para style="terp_default_8">[[ formatLang(line.date,date=True) ]]</para></td>
+        <td><para style="terp_default_Centre_8">[[ line.ref ]]</para></td>
+        <td><para style="terp_default_Centre_8">[[ line.account_id.code ]]</para></td>
+        <td><para style="terp_default_8">[[ line.partner_id and line.partner_id.name ]]</para></td>
+        <td><para style="terp_default_8">[[ line.name ]]</para></td>
+        <td><para style="P8">[[ formatLang(line.debit) ]]</para></td>
+        <td><para style="P8">[[ formatLang(line.credit) ]]</para></td>
+        <td><para style="P8">[[ formatLang(line.credit - line.debit) ]]</para></td>
+      </tr>
+    </blockTable>
+    
     <blockTable colWidths="50.0,65.0,50.0,60.0,89.0,40.0,60.0,50.0,60.0" style="Table1" repeatRows="1">[[ data and 'form' in data and  data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
       <tr>
         <td><para style="P10a">Date</para></td>