Merge lp:~unifield-team/unifield-web/OEB-20 into lp:unifield-web

Proposed by Matthieu Dietrich @ camptocamp
Status: Merged
Merged at revision: 4546
Proposed branch: lp:~unifield-team/unifield-web/OEB-20
Merge into: lp:unifield-web
Diff against target: 12 lines (+1/-1)
1 file modified
addons/openerp/widgets/form/_form.py (+1/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-web/OEB-20
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+65200@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/_form.py'
2--- addons/openerp/widgets/form/_form.py 2011-03-30 10:33:40 +0000
3+++ addons/openerp/widgets/form/_form.py 2011-06-20 14:09:24 +0000
4@@ -492,7 +492,7 @@
5 self.operator = attrs.get('operator', '=')
6 self.search_context = attrs.get('context', {})
7 # m2o as selection
8- if not self.options and attrs.get('relation') and attrs.get('widget') == 'selection':
9+ if not self.options or (attrs.get('relation') and (attrs.get('widget') == 'selection')):
10 proxy = rpc.RPCProxy(attrs['relation'])
11 try:
12 domain = attrs.get('domain', [])

Subscribers

People subscribed via source and target branches

to all changes: