Merge lp:~cmsa/openobject-server/openobject-server-7.0-fix-unaccent into lp:openobject-server

[Carlos Almeida]

[FIX][Bug #1101277] Correction of unaccent bug in product search name with unaccent characters

Unmerged revisions

5157. By Carlos Almeida on 2013-12-03

[FIX][Bug #1101277] Correction of unaccent bug in product search name with unaccent characters

=== modified file 'openerp/osv/expression.py'
--- openerp/osv/expression.py	2013-11-04 13:43:14 +0000
+++ openerp/osv/expression.py	2013-12-03 21:47:50 +0000
@@ -1039,11 +1039,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:
+                            subselect += '     AND value ' + sql_operator + 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',