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

This commit is contained in:
Christophe Simonis
2018-03-01 17:26:43 +01:00
18 changed files with 78 additions and 45 deletions
+1 -1
View File
@@ -60,7 +60,7 @@ Administrator</span>]]></field>
<field name="company_id" ref="main_company"/>
</record>
<record id="ir_mail_server_localhost0" model="ir.mail_server">
<record id="ir_mail_server_localhost0" model="ir.mail_server" forcecreate="0">
<field name="name">localhost</field>
<field name="smtp_host">localhost</field>
<field eval="25" name="smtp_port"/>
@@ -27,8 +27,12 @@ class TestPyLint(TransactionCase):
'W0101', # unreachable code
'mixed-indentation',
'deprecated-module',
]
BAD_MODULES = [
] + list(tools.SUPPORTED_DEBUGGER)
def _skip_test(self, reason):
_logger.warn(reason)
self.skipTest(reason)
@@ -50,6 +54,7 @@ class TestPyLint(TransactionCase):
'--enable=%s' % ','.join(self.ENABLED_CODES),
'--reports=n',
"--msg-template='{msg} ({msg_id}) at {path}:{line}'",
'--deprecated-modules=%s' % ','.join(self.BAD_MODULES),
]
try:
+1 -1
View File
@@ -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)