From 5f9e013af4a4fa4e0dc0fc7ae1ac38e439a15a12 Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Tue, 3 Aug 2010 15:36:31 +0530 Subject: [PATCH] [FIX] general journal bzr revid: mra@mra-laptop-20100803100631-bux4ee53nywpas8a --- addons/account/report/account_general_journal.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/addons/account/report/account_general_journal.py b/addons/account/report/account_general_journal.py index ef723bf7960..8cd3dad05ba 100644 --- a/addons/account/report/account_general_journal.py +++ b/addons/account/report/account_general_journal.py @@ -117,15 +117,14 @@ 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: journals = self.journal_ids if not journals: return 0.0 - self.cr.execute('SELECT SUM(debit) FROM account_move_line ' - 'WHERE period_id=%s AND journal_id IN %s ' + self.cr.execute('SELECT SUM(debit) FROM account_move_line l ' + 'WHERE period_id=%s AND journal_id IN %s ' + self.query_get_clause + ' ' \ 'AND state<>\'draft\'', (period_id, tuple(journals))) return self.cr.fetchone()[0] or 0.0 @@ -137,8 +136,8 @@ class journal_print(report_sxw.rml_parse, common_report_header): journals = self.journal_ids if not journals: return 0.0 - self.cr.execute('SELECT SUM(credit) FROM account_move_line ' - 'WHERE period_id=%s AND journal_id IN %s ' + self.cr.execute('SELECT SUM(credit) FROM account_move_line l ' + 'WHERE period_id=%s AND journal_id IN %s '+ self.query_get_clause + ' ' \ 'AND state<>\'draft\'', (period_id, tuple(journals))) return self.cr.fetchone()[0] or 0.0