From 003c39fd5463fd50051c3e342859e74c1936d662 Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Fri, 9 Jul 2010 12:49:33 +0530 Subject: [PATCH] Revert the changes on wizard of general ledger now it inherit only with common report bzr revid: mra@mra-laptop-20100709071933-fvafne0lnlhq20e6 --- addons/account/report/general_ledger.py | 2 +- addons/account/wizard/account_report_general_ledger.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/addons/account/report/general_ledger.py b/addons/account/report/general_ledger.py index 1bf9a476bf2..26112949720 100644 --- a/addons/account/report/general_ledger.py +++ b/addons/account/report/general_ledger.py @@ -35,7 +35,7 @@ import pooler class general_ledger(rml_parse.rml_parse): _name = 'report.account.general.ledger' - def set_context(self, objects, data, ids, report_type = None): + def set_context(self, objects, data, ids, report_type=None): self.borne_date = self.get_min_date(data['form']) new_ids = [] if (data['model'] == 'account.account'): diff --git a/addons/account/wizard/account_report_general_ledger.py b/addons/account/wizard/account_report_general_ledger.py index 1b9fc0fbc85..55f2be289b2 100644 --- a/addons/account/wizard/account_report_general_ledger.py +++ b/addons/account/wizard/account_report_general_ledger.py @@ -24,7 +24,7 @@ from osv import fields, osv from tools.translate import _ class account_report_general_ledger(osv.osv_memory): - _inherit = "account.common.journal.report" + _inherit = "account.common.report" _name = "account.report.general.ledger" _description = "General Ledger Report" @@ -44,9 +44,8 @@ class account_report_general_ledger(osv.osv_memory): } def _print_report(self, cr, uid, ids, data, query_line, context=None): - data = self.pre_print_report(cr, uid, ids, data, query_line, context=context) data['form'].update(self.read(cr, uid, ids, ['display_account', 'landscape', 'soldeinit', 'amount_currency', 'sortby'])[0]) -# data['form']['query_get'] = query_line + data['form']['query_line'] = query_line if data['form']['landscape'] == True: return { 'type': 'ir.actions.report.xml', 'report_name': 'account.general.ledger_landscape', 'datas': data, 'nodestroy':True, } else: