Merge lp:~fabien-morin/unifield-web/fm-us-2849 into lp:unifield-web

Proposed by jftempo
Status: Merged
Merged at revision: 4844
Proposed branch: lp:~fabien-morin/unifield-web/fm-us-2849
Merge into: lp:unifield-web
Diff against target: 12 lines (+1/-1)
1 file modified
addons/openerp/widgets/listgroup.py (+1/-1)
To merge this branch: bzr merge lp:~fabien-morin/unifield-web/fm-us-2849
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+323482@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
=== modified file 'addons/openerp/widgets/listgroup.py'
--- addons/openerp/widgets/listgroup.py 2017-01-02 14:59:00 +0000
+++ addons/openerp/widgets/listgroup.py 2017-05-02 07:35:41 +0000
@@ -117,7 +117,7 @@
117 ch_ids = []117 ch_ids = []
118 if child:118 if child:
119 rec_dom = rec.get('__domain')119 rec_dom = rec.get('__domain')
120 dom = [('id', 'in', ids), rec_dom[0]]120 dom = [('id', 'in', ids)] + rec_dom
121 ch_ids = [d for id in proxy.search(dom, offset, limit, 0, context)121 ch_ids = [d for id in proxy.search(dom, offset, limit, 0, context)
122 for d in data122 for d in data
123 if int(str(d.get('id'))) == id] # Need to convert in String and then Int.123 if int(str(d.get('id'))) == id] # Need to convert in String and then Int.

Subscribers

People subscribed via source and target branches