Vo Minh Thu (OpenERP) has proposed merging
lp:~openerp-dev/openobject-server/6.1-bug-1049653-translatable-unaccent-vmt
into lp:openobject-server/6.1.
Requested reviews:
OpenERP Core Team (openerp)
Related bugs:
Bug #1049653 in OpenERP Server: "--unaccent option does not work"
https://bugs.launchpad.net/openobject-server/+bug/1049653
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/6.1-bug-1049653-translatable-unaccent-vmt/+merge/131198
--
https://code.launchpad.net/~openerp-dev/openobject-server/6.1-bug-1049653-translatable-unaccent-vmt/+merge/131198
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/6.1-bug-1049653-translatable-unaccent-vmt.
=== modified file 'openerp/osv/expression.py'
--- openerp/osv/expression.py 2012-01-24 12:42:52 +0000
+++ openerp/osv/expression.py 2012-10-24 14:36:22 +0000
@@ -637,11 +637,18 @@
' FROM "' + working_table._table + '"' \
' WHERE "' + left + '" ' + sql_operator + ' ' +" (" + instr + "))"
else:
- subselect += ' AND value ' + sql_operator + instr + \
- ') UNION (' \
- ' SELECT id' \
- ' FROM "' + working_table._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_table._table + '"' \
+ ' WHERE unaccent("' + left + '") ' + sql_operator + ' unaccent(' + instr + '))'
+ else:
+ subselect += ' AND value ' + sql_operator + instr + \
+ ') UNION (' \
+ ' SELECT id' \
+ ' FROM "' + working_table._table + '"' \
+ ' WHERE "' + left + '" ' + sql_operator + instr + ")"
params = [working_table._name + ',' + left,
context.get('lang', False) or 'en_US',
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
