Merge lp:~camptocamp/ocb-addons/7.0-account_period-context-1177348 into lp:ocb-addons

Proposed by Guewen Baconnier @ Camptocamp
Status: Merged
Merged at revision: 9121
Proposed branch: lp:~camptocamp/ocb-addons/7.0-account_period-context-1177348
Merge into: lp:ocb-addons
Diff against target: 21 lines (+8/-2)
1 file modified
account/account.py (+8/-2)
To merge this branch: bzr merge lp:~camptocamp/ocb-addons/7.0-account_period-context-1177348
Reviewer Review Type Date Requested Status
Alexandre Fayolle - camptocamp code review, no test Approve
Yannick Vaucher @ Camptocamp code Approve
Stefan Rijnhart (Opener) Approve
Review via email: mp+162757@code.launchpad.net

Description of the change

Fix for lp:1177348

To post a comment you must log in.
Revision history for this message
Stefan Rijnhart (Opener) (stefan-opener) wrote :

LGMT

review: Approve
Revision history for this message
Yannick Vaucher @ Camptocamp (yvaucher-c2c) :
review: Approve (code)
Revision history for this message
Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) wrote :

LGTM

review: Approve (code review, no test)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/account.py'
2--- account/account.py 2013-04-23 12:57:31 +0000
3+++ account/account.py 2013-05-07 12:05:13 +0000
4@@ -1040,9 +1040,15 @@
5 context = {}
6 ids = []
7 if name:
8- ids = self.search(cr, user, [('code','ilike',name)]+ args, limit=limit)
9+ ids = self.search(cr, user,
10+ [('code', 'ilike', name)] + args,
11+ limit=limit,
12+ context=context)
13 if not ids:
14- ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit)
15+ ids = self.search(cr, user,
16+ [('name', operator, name)] + args,
17+ limit=limit,
18+ context=context)
19 return self.name_get(cr, user, ids, context=context)
20
21 def write(self, cr, uid, ids, vals, context=None):