diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-03-01 18:02:30 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-03-01 18:02:30 +0100 |
| commit | 5ad55264e4b6ae53fe2beb59d6adf46f168e93c9 (patch) | |
| tree | 970c4d9a25696a6188370fd27e407131eb7fc91e /odoo/tools | |
| parent | 5cd0dba0aab1f7dd6a68a996a329fd57486069ab (diff) | |
| parent | b04c8eae6bf8a0da4df734ac8db36cb04aec9802 (diff) | |
[MERGE] forward port branch saas-15 up to b04c8eae6bf
Diffstat (limited to 'odoo/tools')
| -rw-r--r-- | odoo/tools/yaml_import.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/odoo/tools/yaml_import.py b/odoo/tools/yaml_import.py index 7afffab2a0d..bd56e0bd247 100644 --- a/odoo/tools/yaml_import.py +++ b/odoo/tools/yaml_import.py @@ -457,7 +457,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) |