Merge lp:~unifield-team/unifield-web/UFTP-238 into lp:unifield-web

Proposed by jftempo
Status: Merged
Merged at revision: 4740
Proposed branch: lp:~unifield-team/unifield-web/UFTP-238
Merge into: lp:unifield-web
Diff against target: 36 lines (+13/-7)
1 file modified
addons/openerp/widgets/search.py (+13/-7)
To merge this branch: bzr merge lp:~unifield-team/unifield-web/UFTP-238
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+221161@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/search.py'
--- addons/openerp/widgets/search.py 2013-03-27 09:26:25 +0000
+++ addons/openerp/widgets/search.py 2014-05-28 07:05:11 +0000
@@ -411,13 +411,17 @@
411 if defval:411 if defval:
412 model = fields[name].get('relation')412 model = fields[name].get('relation')
413 type2 = fields[name].get('type2')413 type2 = fields[name].get('type2')
414414 many2one_int = False
415 if kind == 'many2one' and model:415 if kind == 'many2one':
416 try:416 if isinstance(default_search, (int, long)):
417 value = rpc.name_get(model, default_search, self.context)417 many2one_int = True
418 except Exception,e:418 defval = default_search
419 value = defval419 elif model:
420 defval = value or ''420 try:
421 value = rpc.name_get(model, default_search, self.context)
422 except Exception,e:
423 value = defval
424 defval = value or ''
421425
422 if attrs.get('filter_domain'):426 if attrs.get('filter_domain'):
423 domain = expr_eval(attrs['filter_domain'], {'self': defval})427 domain = expr_eval(attrs['filter_domain'], {'self': defval})
@@ -442,6 +446,8 @@
442 elif field.kind == 'boolean':446 elif field.kind == 'boolean':
443 domain = [(name, '=', defval!='0')]447 domain = [(name, '=', defval!='0')]
444 448
449 elif many2one_int:
450 domain = [(name, '=', defval)]
445 else:451 else:
446 domain = [(name,fields[name].get('comparator','ilike'), defval)]452 domain = [(name,fields[name].get('comparator','ilike'), defval)]
447453

Subscribers

People subscribed via source and target branches

to all changes: