From 1334243f063a441b8a6bafc7fe93fc4b65880538 Mon Sep 17 00:00:00 2001 From: rha Date: Wed, 9 Feb 2011 12:05:43 +0530 Subject: [PATCH] [IMP] account: improvement in osc memory wizards bzr revid: rha@rha-desktop-20110209063543-63e1qeizm0cnm1u0 --- addons/account/wizard/account_report_balance_sheet.py | 11 ++--------- .../account/wizard/account_report_common_account.py | 6 ------ .../account/wizard/account_report_common_journal.py | 8 -------- .../account/wizard/account_report_common_partner.py | 6 ------ 4 files changed, 2 insertions(+), 29 deletions(-) diff --git a/addons/account/wizard/account_report_balance_sheet.py b/addons/account/wizard/account_report_balance_sheet.py index ef6e02c0d37..0e234c5cc39 100644 --- a/addons/account/wizard/account_report_balance_sheet.py +++ b/addons/account/wizard/account_report_balance_sheet.py @@ -65,15 +65,8 @@ class account_bs_report(osv.osv_memory): def _print_report(self, cr, uid, ids, data, context=None): if context is None: context = {} - data['form'].update(self.read(cr, uid, ids, ['display_type','reserve_account_id'])[0]) - - for field in data['form'].keys(): - if isinstance(data['form'][field], tuple): - data['form'][field] = data['form'][field][0] - for ctx_field in data['form']['used_context'].keys(): - if isinstance(data['form']['used_context'][ctx_field], tuple): - data['form']['used_context'][ctx_field] = data['form']['used_context'][ctx_field][0] - + record = self.browse(cr, uid, ids, context=context)[0] + data['form'].update({'display_type':record.display_type, 'reserve_account_id':record.reserve_account_id.id}) if not data['form']['reserve_account_id']: raise osv.except_osv(_('Warning'),_('Please define the Reserve and Profit/Loss account for current user company !')) data = self.pre_print_report(cr, uid, ids, data, context=context) diff --git a/addons/account/wizard/account_report_common_account.py b/addons/account/wizard/account_report_common_account.py index ac496e9d22e..7205a9e53bf 100644 --- a/addons/account/wizard/account_report_common_account.py +++ b/addons/account/wizard/account_report_common_account.py @@ -39,12 +39,6 @@ class account_common_account_report(osv.osv_memory): if context is None: context = {} data['form'].update(self.read(cr, uid, ids, ['display_account'], context=context)[0]) - for field in data['form'].keys(): - if isinstance(data['form'][field], tuple): - data['form'][field] = data['form'][field][0] - for ctx_field in data['form']['used_context'].keys(): - if isinstance(data['form']['used_context'][ctx_field], tuple): - data['form']['used_context'][ctx_field] = data['form']['used_context'][ctx_field][0] return data account_common_account_report() diff --git a/addons/account/wizard/account_report_common_journal.py b/addons/account/wizard/account_report_common_journal.py index 741b171bfba..8e9db058d31 100644 --- a/addons/account/wizard/account_report_common_journal.py +++ b/addons/account/wizard/account_report_common_journal.py @@ -42,14 +42,6 @@ class account_common_journal_report(osv.osv_memory): if context is None: context = {} data['form'].update(self.read(cr, uid, ids, ['amount_currency'], context=context)[0]) - - for field in data['form'].keys(): - if isinstance(data['form'][field], tuple): - data['form'][field] = data['form'][field][0] - for ctx_field in data['form']['used_context'].keys(): - if isinstance(data['form']['used_context'][ctx_field], tuple): - data['form']['used_context'][ctx_field] = data['form']['used_context'][ctx_field][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) 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) diff --git a/addons/account/wizard/account_report_common_partner.py b/addons/account/wizard/account_report_common_partner.py index 1cf3dfa5a35..05003041eeb 100644 --- a/addons/account/wizard/account_report_common_partner.py +++ b/addons/account/wizard/account_report_common_partner.py @@ -40,12 +40,6 @@ class account_common_partner_report(osv.osv_memory): if context is None: context = {} data['form'].update(self.read(cr, uid, ids, ['result_selection'], context=context)[0]) - for field in data['form'].keys(): - if isinstance(data['form'][field], tuple): - data['form'][field] = data['form'][field][0] - for ctx_field in data['form']['used_context'].keys(): - if isinstance(data['form']['used_context'][ctx_field], tuple): - data['form']['used_context'][ctx_field] = data['form']['used_context'][ctx_field][0] return data account_common_partner_report()