Merge lp:~openerp-dev/openobject-server/6.0-bug-1071710-chs into lp:openobject-server/6.0

[Christophe Simonis (OpenERP)]

=== modified file 'bin/addons/base/test/test_osv_expression.yml'
--- bin/addons/base/test/test_osv_expression.yml	2010-12-29 17:42:23 +0000
+++ bin/addons/base/test/test_osv_expression.yml	2014-01-06 22:46:37 +0000
@@ -110,4 +110,17 @@
         res_ids = self.search(cr, uid, [('company_id.partner_id', 'not in', [])])
         res_ids.sort()
         assert res_ids == all_ids, "Searching against empty set failed, returns %r" % res_ids
-
+-
+    Check that we can exclude translated fields (bug lp:1071710)
+-
+    !python {model: res.country}: |
+        # first install french language
+        BLI = self.pool.get('base.language.install')
+        BLI.lang_install(cr, uid, [BLI.create(cr, uid, {'lang': 'fr_FR'})])
+
+        be_id = self.search(cr, uid, [('name', '=', 'Belgium')])[0]
+
+        ctx = {'lang': 'fr_FR'}
+        not_be = self.search(cr, uid, [('name', '!=', 'Belgique')], context=ctx)
+
+        assert be_id not in not_be, "Search match failed"

=== modified file 'bin/osv/expression.py'
--- bin/osv/expression.py	2011-01-17 08:41:08 +0000
+++ bin/osv/expression.py	2014-01-06 22:46:37 +0000
@@ -37,7 +37,7 @@
 
     def _is_leaf(self, element, internal=False):
         OPS = ('=', '!=', '<>', '<=', '<', '>', '>=', '=?', '=like', '=ilike', 'like', 'not like', 'ilike', 'not ilike', 'in', 'not in', 'child_of')
-        INTERNAL_OPS = OPS + ('inselect',)
+        INTERNAL_OPS = OPS + ('inselect', 'not inselect')
         return (isinstance(element, tuple) or isinstance(element, list)) \
            and len(element) == 3 \
            and (((not internal) and element[1] in OPS) \
@@ -358,6 +358,11 @@
 
                     operator = operator == '=like' and 'like' or operator
 
+                    new_op = 'inselect'
+                    if operator in ['not like', 'not ilike', 'not in', '<>', '!=']:
+                        new_op = 'not inselect'
+                        operator = {'not like': 'like', 'not ilike': 'ilike', 'not in': 'in', '<>': '=', '!=': '='}[operator]
+
                     query1 = '( SELECT res_id'          \
                              '    FROM ir_translation'  \
                              '   WHERE name = %s'       \
@@ -365,7 +370,7 @@
                              '     AND type = %s'
                     instr = ' %s'
                     #Covering in,not in operators with operands (%s,%s) ,etc.
-                    if operator in ['in','not in']:
+                    if operator == 'in':
                         instr = ','.join(['%s'] * len(right))
                         query1 += '     AND value ' + operator +  ' ' +" (" + instr + ")"   \
                              ') UNION ('                \
@@ -386,7 +391,7 @@
                               right,
                              ]
 
-                    self.__exp[i] = ('id', 'inselect', (query1, query2))
+                    self.__exp[i] = ('id', new_op, (query1, query2))
 
         return self
 
@@ -398,6 +403,9 @@
         if operator == 'inselect':
             query = '(%s.%s in (%s))' % (table._table, left, right[0])
             params = right[1]
+        elif operator == 'not inselect':
+            query = '(%s.%s not in (%s))' % (table._table, left, right[0])
+            params = right[1]
         elif operator in ['in', 'not in']:
             params = right and right[:] or []
             len_before = len(params)