Merge lp:~openerp-dev/openobject-server/6.0-opw-581385-cbi into lp:openobject-server/6.0

[Chris Biersbach (OpenERP)]

The bug that was encountered: When using the negative operators in advanced filters, wrong results were shown when the language was not set to english

The reason: If you search, for example, for countries that are not "Belgique", a union between the countries that do not have "Belgique" as original value and that do not have "Belgique" as french translation is made. This is incorrect, since it will return all the countries. This was done to allow the user to search using both the original value "Belgium" and the translated value "Belgique", and it works fine for the positive operators (in which case the union makes perfect sense), but not for the negative operators.

The fix: When using negative operators, an intersection must be used instead of a union.
-> Countries that are called "Belgique" OR whose translated value is "Belgique": Union
-> Countries that are not called "Belgique" AND whose translation is not "Belgique": Intersection
-> In logic: NOT(a OR b) == NOT a AND not b

Unmerged revisions

3643. By Chris Biersbach (OpenERP) on 2012-11-09

[FIX] This fixes incorrect behavior of of advanced search filters containing negative operators on translated fields

=== modified file 'bin/osv/expression.py'
--- bin/osv/expression.py	2011-01-17 08:41:08 +0000
+++ bin/osv/expression.py	2012-11-14 08:17:22 +0000
@@ -23,6 +23,7 @@
 from tools import flatten, reverse_enumerate
 import fields
 
+NEGATIVE_TERM_OPERATORS = ('!=', '<>', 'not like', 'not ilike', 'not in')
 
 class expression(object):
     """
@@ -365,16 +366,20 @@
                              '     AND type = %s'
                     instr = ' %s'
                     #Covering in,not in operators with operands (%s,%s) ,etc.
+                    if operator in NEGATIVE_TERM_OPERATORS:
+                        op = 'INTERSECT'
+                    else:
+                        op = 'UNION'
                     if operator in ['in','not in']:
                         instr = ','.join(['%s'] * len(right))
                         query1 += '     AND value ' + operator +  ' ' +" (" + instr + ")"   \
-                             ') UNION ('                \
+                             ') ' + op + ' ('                \
                              '  SELECT id'              \
                              '    FROM "' + working_table._table + '"'       \
                              '   WHERE "' + left + '" ' + operator + ' ' +" (" + instr + "))"
                     else:
                         query1 += '     AND value ' + operator + instr +   \
-                             ') UNION ('                \
+                             ') ' + op + ' ('                \
                              '  SELECT id'              \
                              '    FROM "' + working_table._table + '"'       \
                              '   WHERE "' + left + '" ' + operator + instr + ")"