Merge lp:~unifield-team/unifield-server/us-1205 into lp:unifield-server

Proposed by jftempo
Status: Merged
Merged at revision: 3737
Proposed branch: lp:~unifield-team/unifield-server/us-1205
Merge into: lp:unifield-server
Diff against target: 11 lines (+1/-0)
1 file modified
bin/osv/expression.py (+1/-0)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-1205
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+292928@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/osv/expression.py'
2--- bin/osv/expression.py 2016-02-16 15:58:35 +0000
3+++ bin/osv/expression.py 2016-04-26 12:24:04 +0000
4@@ -362,6 +362,7 @@
5 ' FROM ir_translation' \
6 ' WHERE name = %s' \
7 ' AND lang = %s' \
8+ ' AND res_id IS NOT NULL' \
9 ' AND type = %s'
10 instr = ' %s'
11 #Covering in,not in operators with operands (%s,%s) ,etc.

Subscribers

People subscribed via source and target branches

to all changes: