Merge lp:~unifield-team/unifield-web/uf-931 into lp:unifield-web

Proposed by jftempo
Status: Merged
Merged at revision: 4661
Proposed branch: lp:~unifield-team/unifield-web/uf-931
Merge into: lp:unifield-web
Diff against target: 13 lines (+2/-1)
1 file modified
addons/openerp/widgets/form/_o2m.py (+2/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-web/uf-931
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+119476@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 'addons/openerp/widgets/form/_o2m.py'
2--- addons/openerp/widgets/form/_o2m.py 2012-03-19 08:20:13 +0000
3+++ addons/openerp/widgets/form/_o2m.py 2012-08-14 06:59:21 +0000
4@@ -171,7 +171,8 @@
5 limit = 0
6 ids = rpc.RPCProxy(self.model).search(domain, current.offset, limit, params.sort_key + ' '+params.sort_order, current.context)
7 id = ids[0]
8- if current and params.source and self.name in params.source.split('/'):
9+ # Issue fixed on revno 4843 on lp:openobject-client-web/6.0
10+ if current and params.source and isinstance(params.source, basestring) and self.name in params.source.split('/'):
11 id = current.id
12
13 id = id or None

Subscribers

People subscribed via source and target branches

to all changes: