[IMP] move data['form']['query_line'] = query_line ==> common report

bzr revid: mra@mra-laptop-20100715105258-j4sdqd7slc8t2qyb
This commit is contained in:
Mustufa Rangwala
2010-07-15 16:22:58 +05:30
parent 3cf22f6118
commit a2c9e31dce
7 changed files with 1 additions and 6 deletions
@@ -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',
@@ -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()
@@ -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()
@@ -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()
@@ -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',
@@ -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()
@@ -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}