Odoo Server (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-server/7.0-set-search-mat into lp:openobject-server/7.0

  1. 7.0-set-search-mat
  2. Merge into 7.0
Proposed by Martin Trigaux (OpenERP)
Status: Merged
Merged at revision: 5214
Proposed branch: lp:~openerp-dev/openobject-server/7.0-set-search-mat
Merge into: lp:openobject-server/7.0
Diff against target: 12 lines (+1/-1)
1 file modified
openerp/osv/expression.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/7.0-set-search-mat
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+203361@code.launchpad.net

Description of the change

expression: do not look at translation in parse when searching with empty string or false
This fixes traceback when applying filter 'is not set' on a translatable field

To post a comment you must log in.
Revision history for this message
Martin Trigaux (OpenERP) (mat-openerp) wrote :

Merged in 7.0

revno: 5214 [merge]
revision-id: <email address hidden>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/osv/expression.py'
2--- openerp/osv/expression.py 2014-01-08 15:27:22 +0000
3+++ openerp/osv/expression.py 2014-01-27 15:59:12 +0000
4@@ -1019,7 +1019,7 @@
5 right += ' 23:59:59'
6 push(create_substitution_leaf(leaf, (left, operator, right), working_model))
7
8- elif field.translate:
9+ elif field.translate and right:
10 need_wildcard = operator in ('like', 'ilike', 'not like', 'not ilike')
11 sql_operator = {'=like': 'like', '=ilike': 'ilike'}.get(operator, operator)
12 if need_wildcard: