odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

test button_uninstall 

bzr revid: tta@openerp.com-20120601134615-zuh7ct4cgr3hn506
This commit is contained in:
Tejas Tank 2012-06-01 19:16:15 +05:30
parent 11d89cf59b
commit 5481df3693
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openerp/addons/base/ir/ir_ui_menu.py
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]

2
openerp/addons/base/res/res_config.py
View File

@ -542,7 +542,7 @@ class res_config_settings(osv.osv_memory):
if to_install_ids:
ir_module.button_immediate_install(cr, uid, to_install_ids, context)
if to_uninstall_ids:
ir_module.module_uninstall(cr, uid, to_uninstall_ids, context)
ir_module.button_uninstall(cr, uid, to_uninstall_ids, context)
# force client-side reload (update user menu and current view)
return {