Merge lp:~openerp-dev/openobject-server/6.0-opw-54583-rgo into lp:openobject-server/6.0

[Ravi Gohil (OpenERP)]

Hello,

'Set Default' option for setting default value of 'one2many' field for current user using 'only for you' option sets wrong value after using option 'for all users' of the same field.

Steps to reproduce(for PO Line O2M):

1) Log in as Admin, set 2 products say CPU1, CPU2 as default in PO line when new PO created by any user using option 'for all users' of 'Set Default', this will bring CPU1, CPU2 products when new PO created by any user(This works fine),
2) Using Admin login, set cpu3 product as default for current user using option 'only for you' of 'Set Default',
3) Create new PO using Admin login, PO line will set CPU1 and CPU2, which is wrong.

Expected Result:
PO line should set CPU3 for admin user.

This fixes the issue.

Thanks.

[Naresh(OpenERP) (nch-openerp)]

review: Approve

=== modified file 'bin/addons/base/ir/ir_values.py'
--- bin/addons/base/ir/ir_values.py	2010-12-06 13:19:28 +0000
+++ bin/addons/base/ir/ir_values.py	2011-12-27 13:41:23 +0000
@@ -173,7 +173,7 @@
                     where.append('res_id=%s')
                     params.append(res_id)
 
-            where.append('(user_id=%s or (user_id IS NULL)) order by id')
+            where.append('(user_id=%s or (user_id IS NULL)) order by user_id')
             params.append(uid)
             clause = ' and '.join(where)
             cr.execute('select id,name,value,object,meta, key from ir_values where ' + clause, params)