From c2393b90e73d2abe5bf2748657fce2cc1bdbea78 Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Fri, 16 Jul 2010 16:44:07 +0530 Subject: [PATCH] [IMP] common report bzr revid: mra@mra-laptop-20100716111407-1103f4n2n5rzyk3y --- addons/account/wizard/account_common_journal_report.py | 5 +++++ addons/account/wizard/account_common_report.py | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/addons/account/wizard/account_common_journal_report.py b/addons/account/wizard/account_common_journal_report.py index 69b099e4393..85fef7e62bb 100644 --- a/addons/account/wizard/account_common_journal_report.py +++ b/addons/account/wizard/account_common_journal_report.py @@ -18,6 +18,7 @@ # along with this program. If not, see . # ############################################################################## + from osv import osv, fields class account_common_journal_report(osv.osv_memory): @@ -29,6 +30,8 @@ class account_common_journal_report(osv.osv_memory): } def _build_context(self, cr, uid, ids, data, context=None): + if context is None: + context = {} result = super(account_common_journal_report, self)._build_context(cr, uid, ids, data, context=context) if data['form']['filter'] == 'filter_date': cr.execute('SELECT period_id FROM account_move_line WHERE date >= %s AND date <= %s', (data['form']['date_from'], data['form']['date_to'])) @@ -36,6 +39,8 @@ class account_common_journal_report(osv.osv_memory): return result 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, ['amount_currency'])[0]) fy_ids = data['form']['fiscalyear_id'] and [data['form']['fiscalyear_id']] or self.pool.get('account.fiscalyear').search(cr, uid, [('state', '=', 'draft')], context=context) period_list = data['form']['periods'] or self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', fy_ids)], context=context) diff --git a/addons/account/wizard/account_common_report.py b/addons/account/wizard/account_common_report.py index 9441a708dbc..12f3c3c2ecc 100644 --- a/addons/account/wizard/account_common_report.py +++ b/addons/account/wizard/account_common_report.py @@ -146,17 +146,18 @@ class account_common_report(osv.osv_memory): def check_report(self, cr, uid, ids, context=None): if context is None: context = {} + obj_move = self.pool.get('account.move.line') data = {} data['ids'] = context.get('active_ids', []) data['model'] = context.get('active_model', 'ir.ui.menu') data['form'] = self.read(cr, uid, ids, ['date_from', 'date_to', 'fiscalyear_id', 'journal_ids', 'period_from', 'period_to', 'filter', 'chart_account_id'])[0] - used_context, used_context_initial_bal = self._build_contexts(cr, uid, ids, data, context) - query_line = self.pool.get('account.move.line')._query_get(cr, uid, obj='l', context=used_context) + used_context, used_context_initial_bal = self._build_contexts(cr, uid, ids, data, context=context) + query_line = obj_move._query_get(cr, uid, obj='l', context=used_context) data['form']['periods'] = used_context.get('periods', False) and used_context['periods'] or [] data['form']['query_line'] = query_line - data['form']['initial_bal_query'] = self.pool.get('account.move.line')._query_get(cr, uid, obj='l', context=used_context_initial_bal) + data['form']['initial_bal_query'] = obj_move._query_get(cr, uid, obj='l', context=used_context_initial_bal) return self._print_report(cr, uid, ids, data, query_line, context=context) account_common_report() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file