From a2c9e31dceb798830694d059f8921200a5b31f09 Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Thu, 15 Jul 2010 16:22:58 +0530 Subject: [PATCH] [IMP] move data['form']['query_line'] = query_line ==> common report bzr revid: mra@mra-laptop-20100715105258-j4sdqd7slc8t2qyb --- addons/account/wizard/account_bs_report.py | 1 - addons/account/wizard/account_common_journal_report.py | 1 - addons/account/wizard/account_common_partner_report.py | 1 - addons/account/wizard/account_common_report.py | 1 + addons/account/wizard/account_pl_report.py | 1 - addons/account/wizard/account_report_balance.py | 1 - addons/account/wizard/account_report_general_ledger.py | 1 - 7 files changed, 1 insertion(+), 6 deletions(-) diff --git a/addons/account/wizard/account_bs_report.py b/addons/account/wizard/account_bs_report.py index a5104d7d9dd..11da6678074 100644 --- a/addons/account/wizard/account_bs_report.py +++ b/addons/account/wizard/account_bs_report.py @@ -49,7 +49,6 @@ class account_bs_report(osv.osv_memory): if context is None: context = {} data['form'].update(self.read(cr, uid, ids, ['display_account', 'display_type', 'reserve_account_id'])[0]) - data['form']['query_line'] = query_line if data['form']['display_type']: return { 'type': 'ir.actions.report.xml', diff --git a/addons/account/wizard/account_common_journal_report.py b/addons/account/wizard/account_common_journal_report.py index 7777919e741..69b099e4393 100644 --- a/addons/account/wizard/account_common_journal_report.py +++ b/addons/account/wizard/account_common_journal_report.py @@ -40,7 +40,6 @@ class account_common_journal_report(osv.osv_memory): 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) data['form']['active_ids'] = self.pool.get('account.journal.period').search(cr, uid, [('journal_id', 'in', data['form']['journal_ids']), ('period_id', 'in', period_list)], context=context) - data['form']['query_line'] = query_line return data account_common_journal_report() diff --git a/addons/account/wizard/account_common_partner_report.py b/addons/account/wizard/account_common_partner_report.py index 04216a08323..5a82ca6cff5 100644 --- a/addons/account/wizard/account_common_partner_report.py +++ b/addons/account/wizard/account_common_partner_report.py @@ -40,7 +40,6 @@ class account_common_partner_report(osv.osv_memory): context = {} data['form'].update(self.read(cr, uid, ids, ['result_selection'])[0]) data['form']['active_ids'] = data['form']['chart_account_id'] # Check me - data['form']['query_line'] = query_line return data account_common_partner_report() diff --git a/addons/account/wizard/account_common_report.py b/addons/account/wizard/account_common_report.py index 45f9111cb83..7af65e82d52 100644 --- a/addons/account/wizard/account_common_report.py +++ b/addons/account/wizard/account_common_report.py @@ -165,6 +165,7 @@ class account_common_report(osv.osv_memory): data['form']['periods'] = used_context['periods'] else: data['form']['periods'] = [] + data['form']['query_line'] = query_line return self._print_report(cr, uid, ids, data, query_line, context=context) account_common_report() diff --git a/addons/account/wizard/account_pl_report.py b/addons/account/wizard/account_pl_report.py index 1cc21c5796a..4387590806b 100644 --- a/addons/account/wizard/account_pl_report.py +++ b/addons/account/wizard/account_pl_report.py @@ -47,7 +47,6 @@ class account_pl_report(osv.osv_memory): if context is None: context = {} data['form'].update(self.read(cr, uid, ids, ['display_account', 'display_type'])[0]) - data['form']['query_line'] = query_line if data['form']['display_type']: return { 'type': 'ir.actions.report.xml', diff --git a/addons/account/wizard/account_report_balance.py b/addons/account/wizard/account_report_balance.py index 8c1209f8143..7021557c747 100644 --- a/addons/account/wizard/account_report_balance.py +++ b/addons/account/wizard/account_report_balance.py @@ -38,7 +38,6 @@ class account_balance_report(osv.osv_memory): def _print_report(self, cr, uid, ids, data, query_line, context=None): data['form'].update(self.read(cr, uid, ids, ['display_account'])[0]) - data['form']['query_line'] = query_line return {'type': 'ir.actions.report.xml', 'report_name': 'account.account.balance', 'datas': data, 'nodestroy':True} account_balance_report() diff --git a/addons/account/wizard/account_report_general_ledger.py b/addons/account/wizard/account_report_general_ledger.py index c75e076e560..1e0687b62ce 100644 --- a/addons/account/wizard/account_report_general_ledger.py +++ b/addons/account/wizard/account_report_general_ledger.py @@ -45,7 +45,6 @@ class account_report_general_ledger(osv.osv_memory): if context is None: context = {} data['form'].update(self.read(cr, uid, ids, ['display_account', 'landscape', 'soldeinit', 'amount_currency', 'sortby'])[0]) - data['form']['query_line'] = query_line if data['form']['landscape']: return { 'type': 'ir.actions.report.xml', 'report_name': 'account.general.ledger_landscape', 'datas': data, 'nodestroy':True } return { 'type': 'ir.actions.report.xml', 'report_name': 'account.general.ledger', 'datas': data, 'nodestroy':True}