From 4539afc752f4386367090ee780f523dc0c34fb8d Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Sat, 10 Jul 2010 10:00:54 +0530
Subject: [PATCH] [IMP] journal reports

bzr revid: mra@mra-laptop-20100710043054-rmmquxm3yo79fj83
---
 addons/account/report/account_journal.py  | 2 +-
 addons/account/report/account_journal.rml | 2 +-
 addons/account/report/general_journal.rml | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/account/report/account_journal.py b/addons/account/report/account_journal.py
index 7f07a2a4f2f..54101d46f00 100644
--- a/addons/account/report/account_journal.py
+++ b/addons/account/report/account_journal.py
@@ -88,7 +88,7 @@ class journal_print(report_sxw.rml_parse):
         return ''
 
     def get_account(self, form):
-        if 'chart_account_id' in form and form['chart_account_id']:
+        if form and 'chart_account_id' in form and form['chart_account_id']:
             return pooler.get_pool(self.cr.dbname).get('account.account').browse(self.cr,self.uid,form['chart_account_id']).name
         return ''
 
diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml
index f641b959473..28d3229fbcd 100644
--- a/addons/account/report/account_journal.rml
+++ b/addons/account/report/account_journal.rml
@@ -222,7 +222,7 @@
         <td><para style="terp_default_Centre_8">[[ data and 'form' in data and data['form']['date_from'] or '' ]]</para></td>
         <td><para style="terp_default_Centre_8">[[ data and 'form' in data and data['form']['date_to'] or '']]</para></td>
         <td><para style="terp_default_Centre_8">[[ data and 'form' in data and data['form']['sort_selection'] or 'date' ]]</para></td>
-        <td><para style="terp_default_Centre_8">[[ get_account(data) ]]</para></td>
+        <td><para style="terp_default_Centre_8">[[ get_account(data and 'form' in data and data['form'] or None) ]]</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 and 'form' in data and data['form']['filter'] or 'No Filter' ]]</para></td>
diff --git a/addons/account/report/general_journal.rml b/addons/account/report/general_journal.rml
index 39441936950..8837c93bc82 100644
--- a/addons/account/report/general_journal.rml
+++ b/addons/account/report/general_journal.rml
@@ -123,14 +123,14 @@
     </blockTable>
     <para style="P9">
       <font color="white"> </font>
-    </para>    
+    </para>
     <blockTable colWidths="72.0,218.0,89.0,83.0,77.0" style="Table_Journal_Title">
       <tr>
         <td><para style="terp_tblheader_Details">Code</para></td>
         <td><para style="terp_tblheader_Details">Journal Name</para></td>
         <td><para style="terp_tblheader_Details">Period</para></td>
-        <td><para style="terp_tblheader_Details_Right">Debit Trans.</para></td>
-        <td><para style="terp_tblheader_Details_Right">Credit Trans.</para></td>
+        <td><para style="terp_tblheader_Details_Right">Debit</para></td>
+        <td><para style="terp_tblheader_Details_Right">Credit</para></td>
       </tr>
     </blockTable>
     <blockTable colWidths="71.0,219.0,89.0,83.0,77.0" style="Table_Final_Total">