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

Proposed by Matthieu Dietrich @ camptocamp
Status: Merged
Merged at revision: 4555
Proposed branch: lp:~unifield-team/unifield-web/OEB-20-web
Merge into: lp:unifield-web
Diff against target: 14 lines (+2/-2)
1 file modified
addons/openerp/widgets/form/_form.py (+2/-2)
To merge this branch: bzr merge lp:~unifield-team/unifield-web/OEB-20-web
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+67556@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/form/_form.py'
--- addons/openerp/widgets/form/_form.py 2011-06-22 08:47:44 +0000
+++ addons/openerp/widgets/form/_form.py 2011-07-11 14:29:39 +0000
@@ -491,8 +491,8 @@
491 self.type2 = attrs.get('type2')491 self.type2 = attrs.get('type2')
492 self.operator = attrs.get('operator', '=')492 self.operator = attrs.get('operator', '=')
493 self.search_context = attrs.get('context', {})493 self.search_context = attrs.get('context', {})
494 # m2o as selection494 #Below mentioned process should be followed for m2o as selection and for boolean field on search panel
495 if not self.options and attrs.get('relation') and attrs.get('widget') == 'selection':495 if (attrs.get('relation') and attrs.get('widget') == 'selection') or (not self.options and attrs.get('type','') != 'boolean'):
496 proxy = rpc.RPCProxy(attrs['relation'])496 proxy = rpc.RPCProxy(attrs['relation'])
497 try:497 try:
498 domain = attrs.get('domain', [])498 domain = attrs.get('domain', [])

Subscribers

People subscribed via source and target branches

to all changes: