[MERGE]

bzr revid: psi@tinyerp.com-20121023050306-9bo55fvimf55k451
2012-10-23 10:33:06 +05:30
parent 5b166040b1 cfaff8a85a
commit 2cf3232aa1
1 changed files with 2 additions and 1 deletions
@@ -2293,7 +2293,8 @@ class BaseModel(object):
                         if view_type == 'tree' or not action[2].get('multi')]
            resprint = [clean(print_) for print_ in resprint
                        if view_type == 'tree' or not print_[2].get('multi')]
-            resrelate = map(lambda x: x[2], resrelate)
+            resrelate = [clean(action) for action in resrelate
+                         if (action[2].get('multi') and view_type == 'tree') or (not action[2].get('multi') and view_type == 'form')]

            for x in itertools.chain(resprint, resaction, resrelate):
                x['string'] = x['name']