diff --git a/bin/addons/base/module/wizard/wizard_module_upgrade.py b/bin/addons/base/module/wizard/wizard_module_upgrade.py index 345820eaf8e..04be1c1428d 100644 --- a/bin/addons/base/module/wizard/wizard_module_upgrade.py +++ b/bin/addons/base/module/wizard/wizard_module_upgrade.py @@ -25,30 +25,25 @@ import os import tools view_form_end = """ -
""" view_form = """ -""" view_field = { - "module_info": {'type': 'text', 'string': 'Modules to update', - 'readonly': True}, - "module_download": {'type': 'text', 'string': 'Modules to download', - 'readonly': True}, + "module_info": {'type': 'text', 'string': 'Modules to update', 'readonly': True}, } class wizard_info_get(wizard.interface): @@ -58,9 +53,7 @@ class wizard_info_get(wizard.interface): ids = mod_obj.search(cr, uid, [ ('state', 'in', ['to upgrade', 'to remove', 'to install'])]) res = mod_obj.read(cr, uid, ids, ['name','state'], context) - url = mod_obj.download(cr, uid, ids, download=False, context=context) - return {'module_info': '\n'.join(map(lambda x: x['name']+' : '+x['state'], res)), - 'module_download': '\n'.join(url)} + return {'module_info': '\n'.join(map(lambda x: x['name']+' : '+x['state'], res))} def _check_upgrade_module(self,cr,uid,data,context): pool = pooler.get_pool(cr.dbname) @@ -104,7 +97,7 @@ class wizard_info_get(wizard.interface): 'result': {'type':'form', 'arch':view_form, 'fields': view_field, 'state':[ ('end', 'Cancel', 'gtk-cancel'), - ('start', 'Start Upgrade', 'gtk-ok', True) + ('start', 'Start update', 'gtk-ok', True) ] } }, @@ -144,9 +137,7 @@ class wizard_info_get_simple(wizard.interface): ids = mod_obj.search(cr, uid, [ ('state', 'in', ['to upgrade', 'to remove', 'to install'])]) res = mod_obj.read(cr, uid, ids, ['name','state'], context) - url = mod_obj.download(cr, uid, ids, download=False, context=context) - return {'module_info': '\n'.join(map(lambda x: x['name']+' : '+x['state'], res)), - 'module_download': '\n'.join(url)} + return {'module_info': '\n'.join(map(lambda x: x['name']+' : '+x['state'], res)),} def _check_upgrade_module(self,cr,uid,data,context): pool = pooler.get_pool(cr.dbname) @@ -170,7 +161,7 @@ class wizard_info_get_simple(wizard.interface): if dep_mod.state in ('unknown','uninstalled'): unmet_packages.append(dep_mod.name) if len(unmet_packages): - raise wizard.except_wizard('Unmet dependency !', 'Following modules are uninstalled or unknown. \n\n'+'\n'.join(unmet_packages)) + raise wizard.except_wizard('Unmet dependencies!', 'The following modules are not installed or unavailable. \n\n'+'\n'.join(unmet_packages)) mod_obj.download(cr, uid, ids, context=context) cr.commit() db, pool = pooler.restart_pool(cr.dbname, update_module=True) @@ -190,7 +181,7 @@ class wizard_info_get_simple(wizard.interface): 'result': {'type':'form', 'arch':view_form, 'fields': view_field, 'state':[ ('end', 'Cancel', 'gtk-cancel'), - ('start', 'Start Upgrade', 'gtk-ok', True) + ('start', 'Start update', 'gtk-ok', True) ] } },