diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-03-01 17:26:43 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-03-01 17:26:43 +0100 |
| commit | b04c8eae6bf8a0da4df734ac8db36cb04aec9802 (patch) | |
| tree | 5f75f4c32e6f2a770cb0de62271d521880dfacca /odoo | |
| parent | 9a1d71ce95fd3c0476aee358b37e29fd7cd8edc7 (diff) | |
| parent | 153ae5e8b834345673a1fa23e0724e4c67a66df2 (diff) | |
[MERGE] forward port branch saas-14 up to 153ae5e8b83
Diffstat (limited to 'odoo')
| -rw-r--r-- | odoo/addons/base/base_data.xml | 2 | ||||
| -rw-r--r-- | odoo/addons/test_pylint/tests/test_pylint.py | 5 | ||||
| -rw-r--r-- | odoo/tools/yaml_import.py | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/odoo/addons/base/base_data.xml b/odoo/addons/base/base_data.xml index 322cd3ae324..f2f6ae363c0 100644 --- a/odoo/addons/base/base_data.xml +++ b/odoo/addons/base/base_data.xml @@ -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"/> diff --git a/odoo/addons/test_pylint/tests/test_pylint.py b/odoo/addons/test_pylint/tests/test_pylint.py index 22573c699a2..fd31bafe161 100644 --- a/odoo/addons/test_pylint/tests/test_pylint.py +++ b/odoo/addons/test_pylint/tests/test_pylint.py @@ -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: diff --git a/odoo/tools/yaml_import.py b/odoo/tools/yaml_import.py index a597a8a44fa..3889faa2c80 100644 --- a/odoo/tools/yaml_import.py +++ b/odoo/tools/yaml_import.py @@ -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) |