Merge lp:~camptocamp/openobject-addons/8.0-account_period-context-1177348 into lp:openobject-addons

Proposed by Guewen Baconnier @ Camptocamp
Status: Rejected
Rejected by: Martin Trigaux (OpenERP)
Proposed branch: lp:~camptocamp/openobject-addons/8.0-account_period-context-1177348
Merge into: lp:openobject-addons
Diff against target: 21 lines (+8/-2)
1 file modified
account/account.py (+8/-2)
To merge this branch: bzr merge lp:~camptocamp/openobject-addons/8.0-account_period-context-1177348
Reviewer Review Type Date Requested Status
Alexandre Fayolle - camptocamp (community) code review, no test Approve
OpenERP Core Team Pending
Review via email: mp+162756@code.launchpad.net

Description of the change

Fix for lp:1177348

To post a comment you must log in.
Revision history for this message
Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) wrote :

LGTM

review: Approve (code review, no test)
Revision history for this message
Martin Trigaux (OpenERP) (mat-openerp) wrote :

Hello,
I reject this patch as the one from 7.0-account_period-context-1177348 has been merged into v7 at revision 9178 (revision-id: <email address hidden>).
These changes will be integrated into trunk at the next forward-port.
Regards

Unmerged revisions

8698. By Guewen Baconnier @ Camptocamp

[FIX] context is not propagated through account_period.name_search to account_period.search

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-18 10:39:07 +0000
3+++ account/account.py 2013-05-07 12:02:05 +0000
4@@ -1034,9 +1034,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):

Subscribers

People subscribed via source and target branches

to all changes: