Merge lp:~yann-papouin/openobject-server/7.0-bug-1049653-translatable-unaccent into lp:openobject-server/7.0

[Yann Papouin]

Unmerged revisions

5257. By Damián Soriano (damiansoriano) on 2014-03-09

[FIX] --unaccent parameter does not work

=== modified file 'openerp/osv/expression.py'
--- openerp/osv/expression.py	2014-02-03 12:05:25 +0000
+++ openerp/osv/expression.py	2014-03-10 08:59:05 +0000
@@ -1046,11 +1046,18 @@
                              '    FROM "' + working_model._table + '"'       \
                              '   WHERE "' + left + '" ' + sql_operator + ' ' + " (" + instr + "))"
                     else:
-                        subselect += '     AND value ' + sql_operator + instr +   \
-                             ') UNION ('                \
-                             '  SELECT id'              \
-                             '    FROM "' + working_model._table + '"'       \
-                             '   WHERE "' + left + '" ' + sql_operator + instr + ")"
+                        if self.has_unaccent and sql_operator in ('ilike', 'not ilike'):
+                            subselect += '     AND unaccent(value) ' + sql_operator + ' unaccent(' + instr +   \
+                                 ')) UNION ('                \
+                                 '  SELECT id'              \
+                                 '    FROM "' + working_model._table + '"'       \
+                                 '   WHERE unaccent("' + left + '") ' + sql_operator + ' unaccent(' + instr + '))'
+                        else:
+                            subselect += '     AND value ' + sql_operator + instr +   \
+                                 ') UNION ('                \
+                                 '  SELECT id'              \
+                                 '    FROM "' + working_model._table + '"'       \
+                                 '   WHERE "' + left + '" ' + sql_operator + instr + ")"
 
                     params = [working_model._name + ',' + left,
                               context.get('lang', False) or 'en_US',