pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] account: improvement in osc memory wizards

Browse Source 
bzr revid: rha@rha-desktop-20110209063543-63e1qeizm0cnm1u0
This commit is contained in:
rha
2011-02-09 12:05:43 +05:30
parent bf1b45c2bc
commit 1334243f06
4 changed files with 2 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/wizard/account_report_balance_sheet.py
+2 -9
View File
@@ -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)
addons/account/wizard/account_report_common_account.py
-6
View File
@@ -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()
addons/account/wizard/account_report_common_journal.py
-8
View File
@@ -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)
addons/account/wizard/account_report_common_partner.py
-6
View File
@@ -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()