From 7ca35d67ee81958faf0fc5269d90d0432124e778 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20=C3=89vrard?= Date: Fri, 21 Oct 2016 17:59:44 +0200 Subject: [PATCH] Fix missed renaming of install to activate (take II) issue1456 --- trytond/convert.py | 2 +- trytond/modules/__init__.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/trytond/convert.py b/trytond/convert.py index 3a3e297d5f..279dc9080a 100644 --- a/trytond/convert.py +++ b/trytond/convert.py @@ -587,7 +587,7 @@ class TrytondXmlHandler(sax.handler.ContentHandler): if module == self.module and fs_id in self.to_delete: self.to_delete.remove(fs_id) - if self.noupdate and self.module_state != 'to install': + if self.noupdate and self.module_state != 'to activate': return # this record is already in the db: diff --git a/trytond/modules/__init__.py b/trytond/modules/__init__.py index a5c6036783..2a06a7c034 100644 --- a/trytond/modules/__init__.py +++ b/trytond/modules/__init__.py @@ -231,8 +231,8 @@ def load_module_graph(graph, pool, update=None, lang=None): package_state = module2state.get(module, 'not activated') if (is_module_to_install(module, update) or (update - and package_state in ('to install', 'to upgrade'))): - if package_state not in ('to install', 'to upgrade'): + and package_state in ('to activate', 'to upgrade'))): + if package_state not in ('to activate', 'to upgrade'): if package_state == 'activated': package_state = 'to upgrade' elif package_state != 'to remove':