openerp-dev-web team mailing list archive

["Ravi Gadhia \(OpenERP\)" <rga@xxxxxxxxxxx>]

Ravi Gadhia (OpenERP) has proposed merging lp:~openerp-dev/openobject-server/trunk-bug-780418-rga into lp:openobject-server.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #780418 in OpenERP Server: "Cannot 'set as default' Warehouse field in PO"
  https://bugs.launchpad.net/openobject-server/+bug/780418

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-bug-780418-rga/+merge/60901
-- 
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-bug-780418-rga/+merge/60901
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-server/trunk-bug-780418-rga.

=== modified file 'openerp/addons/base/ir/ir_values.py'
--- openerp/addons/base/ir/ir_values.py	2010-12-06 13:19:28 +0000
+++ openerp/addons/base/ir/ir_values.py	2011-05-13 11:20:52 +0000
@@ -172,8 +172,10 @@
                 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)