From 26947ef5969c181a19e7bd0f44b7310bcc57b7e2 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@mra-laptop>
Date: Tue, 3 Aug 2010 15:07:23 +0530
Subject: [PATCH] [REF]

bzr revid: mra@mra-laptop-20100803093723-dejx82wye5geawl4
---
 addons/account/report/account_general_journal.py  | 1 +
 addons/account/report/account_general_journal.rml | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/account/report/account_general_journal.py b/addons/account/report/account_general_journal.py
index d5e73fd2d42..ef723bf7960 100644
--- a/addons/account/report/account_general_journal.py
+++ b/addons/account/report/account_general_journal.py
@@ -117,6 +117,7 @@ class journal_print(report_sxw.rml_parse, common_report_header):
         return data['form']['amount_currency']
 
     def _sum_debit_period(self, period_id, journal_id=False):
+
         if journal_id:
             journals = [journal_id]
         else:
diff --git a/addons/account/report/account_general_journal.rml b/addons/account/report/account_general_journal.rml
index fa5c7d2875e..d22cb9d80cb 100644
--- a/addons/account/report/account_general_journal.rml
+++ b/addons/account/report/account_general_journal.rml
@@ -309,10 +309,10 @@
             </para>
           </td>
           <td>
-            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit_period(o.period_id.id, o.journal_id.id)) ]]</para>
+            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit_period(o.id, o.journal_id.id)) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_period(o.period_id.id, o.journal_id.id)) ]]</para>
+            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_period(o.id, o.journal_id.id)) ]]</para>
           </td>
           <td>
           <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_period(o.id, o.journal_id.id)-sum_debit_period(o.id, o.journal_id.id)) ]]</para>
@@ -346,7 +346,7 @@
         </tr>
       </blockTable>
       <blockTable colWidths="82.0,118.0,83.0,88.0,100.0" style="Table_Journal_Detail">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
-        <tr>[[ lines(o.id) or removeParentNode('blockTable')]]
+        <tr>
           <td>
             <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(lines(o.id),'line')]]</font> [[ line['code'] ]]</para>
           </td>
@@ -365,7 +365,7 @@
         </tr>
       </blockTable>
       <blockTable colWidths="80.0,100.0,73.0,80.0,80.0,80.0" style="Table_Journal_Detail">[[ display_currency(data)  or removeParentNode('blockTable') ]]
-        <tr>[[ lines(o.id) or removeParentNode('blockTable')]]
+        <tr>
           <td><para style="terp_default_9"><font>[[ repeatIn(lines(o.id),'line')]]</font> [[ line['code'] ]]</para></td>
           <td><para style="terp_default_9">[[ line['name'] ]]</para></td>
           <td><para style="terp_default_Right_9">[[ formatLang(line['debit'] )]]</para></td>