diff --git a/addons/website_theme_install/models/ir_module_module.py b/addons/website_theme_install/models/ir_module_module.py index 8f7515c3a10..e074c58a515 100644 --- a/addons/website_theme_install/models/ir_module_module.py +++ b/addons/website_theme_install/models/ir_module_module.py @@ -141,7 +141,7 @@ class IrModuleModule(models.Model): if not find and model == 'ir.attachment': find = rec.copy_ids.search([('key', '=', rec.key), ('website_id', '=', website.id)]) - if model == 'ir.ui.view': + if old and model == 'ir.ui.view': # at update, ignore active field rec_data.pop('active') if find: @@ -215,8 +215,8 @@ class IrModuleModule(models.Model): self.ensure_one() mods_to_load = reversed(self + self.upstream_dependencies(exclude_states=('',)).filtered(lambda x: x.name.startswith('theme_'))) for mod in mods_to_load: - _logger.info('Load theme %s for website %s from template.' % (self.mapped('name'), website.id)) - self._load_one_theme_module(website, with_update=False) + _logger.info('Load theme %s for website %s from template.' % (mod.name, website.id)) + mod._load_one_theme_module(website, with_update=False) self.env['theme.utils']._post_copy(mod) @api.multi diff --git a/addons/website_theme_install/views/views.xml b/addons/website_theme_install/views/views.xml index e4ad6782060..a93ac2ce577 100644 --- a/addons/website_theme_install/views/views.xml +++ b/addons/website_theme_install/views/views.xml @@ -26,7 +26,7 @@