diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-06-06 19:38:29 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-06-06 19:38:29 +0200 |
| commit | 99c34c41193660f6aa2d6958cea5956f87bfc59b (patch) | |
| tree | fac338bcb4d007a84276a4c7cc8a4e16dd20ea14 /addons/base_import_module/models | |
| parent | 3ac160aa09ef63df5fe1d057aeb3a9c9e2610e77 (diff) | |
| parent | 6f3eada2c3a5c0a21c9b3fef3bef3f655b0892e4 (diff) | |
[MERGE] forward port branch saas-16 up to 6f3eada2c3a
Diffstat (limited to 'addons/base_import_module/models')
| -rw-r--r-- | addons/base_import_module/models/ir_module.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/base_import_module/models/ir_module.py b/addons/base_import_module/models/ir_module.py index 5219bc240d5..0ebd1144ada 100644 --- a/addons/base_import_module/models/ir_module.py +++ b/addons/base_import_module/models/ir_module.py @@ -22,7 +22,7 @@ class IrModule(models.Model): imported = fields.Boolean(string="Imported Module") @api.multi - def import_module(self, module, path, force=False): + def _import_module(self, module, path, force=False): known_mods = self.search([]) known_mods_names = {m.name: m for m in known_mods} installed_mods = [m.name for m in known_mods if m.state == 'installed'] @@ -107,7 +107,7 @@ class IrModule(models.Model): try: # assert mod_name.startswith('theme_') path = opj(module_dir, mod_name) - self.import_module(mod_name, path, force=force) + self._import_module(mod_name, path, force=force) success.append(mod_name) except Exception as e: _logger.exception('Error while importing module') |