From b88db202c36b768369684f62fd8fc829d02d0eb4 Mon Sep 17 00:00:00 2001 From: "Amit Dodiya (OpenERP)" Date: Fri, 20 May 2011 15:00:57 +0530 Subject: [PATCH] [FIX] account_voucher: change the behaviour of fields_view_get method bzr revid: ado@tinyerp.com-20110520093057-86afzuq2i5ax030n --- addons/account_voucher/account_voucher.py | 26 ++++++++++++----------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py index 4be8967320f..d624fe8564d 100644 --- a/addons/account_voucher/account_voucher.py +++ b/addons/account_voucher/account_voucher.py @@ -118,20 +118,22 @@ class account_voucher(osv.osv): def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False): mod_obj = self.pool.get('ir.model.data') if context is None: context = {} + def get_res_id(view_type, condition): + result = False + if view_type == 'tree': + result = mod_obj.get_object_reference(cr, uid, 'account_voucher', 'view_voucher_tree') + elif view_type == 'form': + if condition: + result = mod_obj.get_object_reference(cr, uid, 'account_voucher', 'view_vendor_receipt_form') + else: + result = mod_obj.get_object_reference(cr, uid, 'account_voucher', 'view_vendor_payment_form') + return result and result[1] or False + if not view_id and context.get('invoice_type', False): - if context.get('invoice_type', False) in ('out_invoice', 'out_refund'): - result = mod_obj.get_object_reference(cr, uid, 'account_voucher', 'view_vendor_receipt_form') - else: - result = mod_obj.get_object_reference(cr, uid, 'account_voucher', 'view_vendor_payment_form') - result = result and result[1] or False - view_id = result + view_id = get_res_id(view_type,context.get('invoice_type', False) in ('out_invoice', 'out_refund')) + if not view_id and context.get('line_type', False): - if context.get('line_type', False) == 'customer': - result = mod_obj.get_object_reference(cr, uid, 'account_voucher', 'view_vendor_receipt_form') - else: - result = mod_obj.get_object_reference(cr, uid, 'account_voucher', 'view_vendor_payment_form') - result = result and result[1] or False - view_id = result + view_id = get_res_id(view_type,context.get('line_type', False) == 'customer') res = super(account_voucher, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu) doc = etree.XML(res['arch'])