[FIX] ir.values: avoid returning conditional defaults when condition is not set

This should un-break the tests introduced
 in previous revision

bzr revid: odo@openerp.com-20120209130854-x73j0ouyjsjnhsdg

diff --git a/openerp/addons/base/ir/ir_values.py b/openerp/addons/base/ir/ir_values.py
index 3802bae..29ef304 100644 (file)
--- a/openerp/addons/base/ir/ir_values.py
+++ b/openerp/addons/base/ir/ir_values.py
@@ -290,10 +290,12 @@ class ir_values(osv.osv):
                           )
                       %s
                    ORDER BY v.user_id, u.company_id"""
-        query = query % ('AND v.key2 = %s' if condition else '')
         params = ('default', model, uid, uid)
         if condition:
+            query = query % 'AND v.key2 = %s'
             params += (condition[:200],)
+        else:
+            query = query % 'AND v.key2 is NULL'
         cr.execute(query, params)
 
         # keep only the highest priority default for each field