From 2f81b78ca6861b10a66bc7e08209114bbd4d6653 Mon Sep 17 00:00:00 2001 From: "qdp-launchpad@tinyerp.com" <> Date: Tue, 6 Jul 2010 18:50:14 +0200 Subject: [PATCH] [FIX] account: general ledger printing without any filter by period bzr revid: qdp-launchpad@tinyerp.com-20100706165014-j2c7by3t03u8p3o1 --- addons/account/report/general_ledger.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/addons/account/report/general_ledger.py b/addons/account/report/general_ledger.py index 9442efc1db3..3f54ab533e9 100644 --- a/addons/account/report/general_ledger.py +++ b/addons/account/report/general_ledger.py @@ -326,17 +326,22 @@ class general_ledger(rml_parse.rml_parse): return currency_total def get_fiscalyear(self,form): - print "formmmmmmmmmm", form return pooler.get_pool(self.cr.dbname).get('account.fiscalyear').browse(self.cr,self.uid,form['fiscalyear_id']).name def get_account(self,form): return pooler.get_pool(self.cr.dbname).get('account.account').browse(self.cr,self.uid,form['chart_account_id']).name def get_start_period(self, form): - return pooler.get_pool(self.cr.dbname).get('account.period').browse(self.cr,self.uid,form['period_from']).name + if form['filter'] == 'filter_period': + if form['period_from']: + return pooler.get_pool(self.cr.dbname).get('account.period').browse(self.cr,self.uid,form['period_from']).name + return '' def get_end_period(self, form): - return pooler.get_pool(self.cr.dbname).get('account.period').browse(self.cr,self.uid,form['period_to']).name + if form['filter'] == 'filter_period': + if form['period_to']: + return pooler.get_pool(self.cr.dbname).get('account.period').browse(self.cr,self.uid,form['period_to']).name + return '' report_sxw.report_sxw('report.account.general.ledger', 'account.account', 'addons/account/report/general_ledger.rml', parser=general_ledger, header=False) report_sxw.report_sxw('report.account.general.ledger_landscape', 'account.account', 'addons/account/report/general_ledger_landscape.rml', parser=general_ledger, header=False)