diff options
| author | Fabien Pinckaers <fp@tinyerp.com> | 2008-12-14 17:46:47 +0100 |
|---|---|---|
| committer | Fabien Pinckaers <fp@tinyerp.com> | 2008-12-14 17:46:47 +0100 |
| commit | 8cb88b60541aa2a232af13e2967ad3220ab650ff (patch) | |
| tree | a9e93944d6b479d98213382f026b3df17f2493b0 /bin/addons/base/module/module.py | |
| parent | 2b5971f125c49c62cb2045f6766a2ff4424a2b76 (diff) | |
improvements_bugfixes
bzr revid: fp@tinyerp.com-20081214164647-hku6dlqkd65fe8ry
Diffstat (limited to 'bin/addons/base/module/module.py')
| -rw-r--r-- | bin/addons/base/module/module.py | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py index 2fb77c926f0..439cf5b57a6 100644 --- a/bin/addons/base/module/module.py +++ b/bin/addons/base/module/module.py @@ -122,15 +122,19 @@ class module(osv.osv): view_id = model_data_obj.search(cr,uid,[('module','in', mnames.keys()), ('model','in',('ir.ui.view','ir.actions.report.xml','ir.ui.menu'))]) for data_id in model_data_obj.browse(cr,uid,view_id,context): - key = data_id['model'] - if key=='ir.ui.view': - v = view_obj.browse(cr,uid,data_id.res_id) - aa = v.inherit_id and '* INHERIT ' or '' - res[mnames[data_id.module]]['views_by_module'] += aa + v.name + ' ('+v.type+')\n' - elif key=='ir.actions.report.xml': - res[mnames[data_id.module]]['reports_by_module'] += report_obj.browse(cr,uid,data_id.res_id).name + '\n' - elif key=='ir.ui.menu': - res[mnames[data_id.module]]['menus_by_module'] += menu_obj.browse(cr,uid,data_id.res_id).complete_name + '\n' + # We use try except, because views or menus may not exist + try: + key = data_id['model'] + if key=='ir.ui.view': + v = view_obj.browse(cr,uid,data_id.res_id) + aa = v.inherit_id and '* INHERIT ' or '' + res[mnames[data_id.module]]['views_by_module'] += aa + v.name + ' ('+v.type+')\n' + elif key=='ir.actions.report.xml': + res[mnames[data_id.module]]['reports_by_module'] += report_obj.browse(cr,uid,data_id.res_id).name + '\n' + elif key=='ir.ui.menu': + res[mnames[data_id.module]]['menus_by_module'] += menu_obj.browse(cr,uid,data_id.res_id).complete_name + '\n' + except KeyError, e: + pass return res _columns = { |