pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE]: Merged with lp:~openerp-dev/openobject-server/trunk-config-wizard-clean-tta

Browse Source 
bzr revid: atp@tinyerp.com-20120608110704-y3efta63xcbzy0py
This commit is contained in:
Atul Patel (OpenERP)
2012-06-08 16:37:04 +05:30
parent 4dcc28c2c9 d3f3387f8f
commit e6deac419e
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openerp/addons/base/ir/ir_ui_menu.py
+2 -1
View File
@@ -261,7 +261,8 @@ class ir_ui_menu(osv.osv):
res = {}
for menu in self.browse(cr, uid, ids, context=context):
res[menu.id] = {}
if menu.action and menu.action.type == 'ir.actions.act_window' and menu.action.res_model:
if menu.action and menu.action.type == 'ir.actions.act_window' and menu.action.res_model:
menu_needaction_res = self.pool.get(menu.action.res_model)._get_needaction_info(cr, uid, uid, domain=menu.action.domain, context=context)
else:
menu_needaction_res = [False, 0]
openerp/addons/base/res/res_config.py
+15 -5
View File
@@ -500,9 +500,9 @@ class res_config_settings(osv.osv_memory):
# overridden to make fields of installed modules readonly
res = super(res_config_settings, self).fields_get(cr, uid, allfields, context, write_access)
classified = self._get_classified_fields(cr, uid, context)
for name, module in classified['module']:
if name in res and module.state in ('installed', 'to install', 'to upgrade'):
res[name]['readonly'] = True
#for name, module in classified['module']:
# if name in res and module.state in ('installed', 'to install', 'to upgrade'):
# res[name]['readonly'] = False
return res
def execute(self, cr, uid, ids, context=None):
@@ -533,11 +533,21 @@ class res_config_settings(osv.osv_memory):
# module fields: install immediately the selected modules
to_install_ids = []
to_uninstall_ids = []
for name, module in classified['module']:
if config[name] and module.state == 'uninstalled':
to_install_ids.append(module.id)
if config[name]:
if module.state == 'uninstalled': to_install_ids.append(module.id)
else:
if module.state in ['installed','upgrade']: to_uninstall_ids.append(module.id)
if to_install_ids:
ir_module.button_immediate_install(cr, uid, to_install_ids, context)
if to_uninstall_ids:
# Module unInstallation.
dep_ids = ir_module.downstream_dependencies(cr, uid, to_uninstall_ids, context=context)
ir_module.module_uninstall(cr, uid, to_uninstall_ids + dep_ids , context)
cr.commit()
_logger.info('Reloading registry once more after uninstalling modules')
pooler.restart_pool(cr.dbname, update_module=True)
# force client-side reload (update user menu and current view)
return {