[MERGE] forward port branch saas-14 up to 153ae5e8b8

2018-03-01 17:26:43 +01:00
parent 9a1d71ce95 153ae5e8b8
commit b04c8eae6b
18 changed files with 78 additions and 45 deletions
@@ -461,7 +461,7 @@ class YamlInterpreter(object):
                    ctx['field_parent'] = fg[field_name]['relation_field']
                if default and field_elem.get('context'):
                    ctx.update(safe_eval(field_elem.get('context'),
-                                         globals_dict={'parent': dotdict(parent)},
+                                         globals_dict={'parent': dotdict(parent), 'context': ctx},
                                         locals_dict=record_dict))

                field_value = self._eval_field(model, field_name, fields[field_name], form_view, parent=record_dict, default=default, context=ctx)