From e48c0c8ef29dba245e7fba658b993e282a07fdd7 Mon Sep 17 00:00:00 2001 From: "RGA (OpenERP)" Date: Fri, 13 May 2011 15:51:19 +0530 Subject: [PATCH] [Fix] Set default value for current login user lp bug: https://launchpad.net/bugs/780418 fixed bzr revid: rga@tinyerp.com-20110513102119-aw4n336m5wcm0c9o --- openerp/addons/base/ir/ir_values.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/openerp/addons/base/ir/ir_values.py b/openerp/addons/base/ir/ir_values.py index 79b1b5e338c..00e0dc6b7df 100644 --- a/openerp/addons/base/ir/ir_values.py +++ b/openerp/addons/base/ir/ir_values.py @@ -172,8 +172,10 @@ class ir_values(osv.osv): else: where.append('res_id=%s') params.append(res_id) - - where.append('(user_id=%s or (user_id IS NULL)) order by id') + order = 'id' + if key == 'default': + order = 'user_id' + where.append('(user_id=%s or (user_id IS NULL)) order by '+ order) params.append(uid) clause = ' and '.join(where) cr.execute('select id,name,value,object,meta, key from ir_values where ' + clause, params)