From 1720dafe5c69a64e15f90b169819efa561e6a1e3 Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Mon, 2 Aug 2010 11:00:51 +0530 Subject: [PATCH] [IMP] Account print journal report clean bzr revid: mra@mra-laptop-20100802053051-10bp1g4lndc2i43b --- addons/account/report/account_journal.py | 11 +++++------ addons/account/wizard/account_report_print_journal.py | 9 ++------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/addons/account/report/account_journal.py b/addons/account/report/account_journal.py index c072f59197c..cbf34c33ee6 100644 --- a/addons/account/report/account_journal.py +++ b/addons/account/report/account_journal.py @@ -21,7 +21,6 @@ import time -import pooler from common_report_header import common_report_header from report import report_sxw # @@ -36,7 +35,7 @@ class journal_print(report_sxw.rml_parse, common_report_header): self.period_ids = [] self.journal_ids = [] self.sort_selection = 'date' - self.localcontext.update( { + self.localcontext.update({ 'time': time, 'lines': self.lines, 'sum_debit': self._sum_debit, @@ -52,13 +51,13 @@ class journal_print(report_sxw.rml_parse, common_report_header): 'get_end_date':self._get_end_date, 'display_currency':self._display_currency, 'get_sortby': self._get_sortby, - }) + }) def set_context(self, objects, data, ids, report_type=None): new_ids = ids self.query_get_clause = '' if (data['model'] == 'ir.ui.menu'): - new_ids = 'active_ids' in data['form'] and data['form']['active_ids'] or [] + new_ids = data['form'].get('active_ids', []) self.query_get_clause = 'AND ' self.query_get_clause += data['form']['query_line'] or '' self.sort_selection = data['form']['sort_selection'] @@ -67,7 +66,7 @@ class journal_print(report_sxw.rml_parse, common_report_header): self.cr.execute('SELECT period_id, journal_id FROM account_journal_period WHERE id IN %s', (tuple(new_ids),)) res = self.cr.fetchall() self.period_ids, self.journal_ids = zip(*res) - return super(journal_print, self).set_context(objects, data, ids, report_type) + return super(journal_print, self).set_context(objects, data, ids, report_type=report_type) def lines(self, period_id, journal_id=[]): obj_mline = self.pool.get('account.move.line') @@ -88,7 +87,7 @@ class journal_print(report_sxw.rml_parse, common_report_header): self.account_currency = False def _get_fiscalyear(self, data): - if data['model']=='account.journal.period': + if data['model'] == 'account.journal.period': return self.pool.get('account.journal.period').browse(self.cr, self.uid, data['id']).fiscalyear_id.name return super(journal_print ,self)._get_fiscalyear(data) diff --git a/addons/account/wizard/account_report_print_journal.py b/addons/account/wizard/account_report_print_journal.py index 468dda6194c..ff6832d2ec1 100644 --- a/addons/account/wizard/account_report_print_journal.py +++ b/addons/account/wizard/account_report_print_journal.py @@ -35,17 +35,12 @@ class account_print_journal(osv.osv_memory): 'sort_selection': 'date', } - def pre_print_report(self, cr, uid, ids, data, query_line, context=None): - if context is None: - context = {} - data['form'].update(self.read(cr, uid, ids, ['sort_selection'])[0]) - return super(account_print_journal, self).pre_print_report(cr, uid, ids, data, query_line, context=context) - def _print_report(self, cr, uid, ids, data, query_line, context=None): if context is None: context = {} data = self.pre_print_report(cr, uid, ids, data, query_line, context=context) - return {'type': 'ir.actions.report.xml', 'report_name': 'account.journal.period.print', 'datas': data, 'nodestroy':True} + data['form'].update(self.read(cr, uid, ids, ['sort_selection'])[0]) + return {'type': 'ir.actions.report.xml', 'report_name': 'account.journal.period.print', 'datas': data} account_print_journal()