diff --git a/ext/custom-addons/cam_custom/cam_custom.py b/ext/custom-addons/cam_custom/cam_custom.py index aeb2ff42..785b34b2 100644 --- a/ext/custom-addons/cam_custom/cam_custom.py +++ b/ext/custom-addons/cam_custom/cam_custom.py @@ -27,6 +27,33 @@ from openerp import SUPERUSER_ID from openerp import tools from lxml import etree +DISABLED_MENUS = [ +] + +class ir_ui_menu(osv.osv): + _inherit = 'ir.ui.menu' + + @tools.ormcache(skiparg=2) + def get_disabled_menu_ids(self, cr, uid, context=None): + data_obj = self.pool.get('ir.model.data') + + menu_ids = [] + for menu in DISABLED_MENUS: + module,xml_id = menu.split('.') + menu = data_obj.get_object(cr, uid, module, xml_id) + if menu: + menu_ids.append(menu.id) + return menu_ids + + def _filter_visible_menus(self, cr, uid, ids, context=None): + if uid != 1: + disabled_ids = self.get_disabled_menu_ids(cr, uid) + + ids = [id for id in ids if id not in disabled_ids] + + ids = super(ir_ui_menu, self)._filter_visible_menus(cr, uid, ids, context) + return ids + class res_partner(osv.osv): _inherit = 'res.partner' diff --git a/setup/lib/functions.py b/setup/lib/functions.py index f527e1b8..e2d581ce 100755 --- a/setup/lib/functions.py +++ b/setup/lib/functions.py @@ -130,6 +130,7 @@ class CamadeusFunctions(): vals.update(self.config.purchase_config) wizard_id = self._execute('purchase.config.settings', 'create', vals) return self._execute('purchase.config.settings', 'execute', [wizard_id]) + return True def sale_config(self): """Basiskonfiguration für Verkauf laden""" @@ -146,7 +147,8 @@ class CamadeusFunctions(): vals = self._execute('stock.config.settings', 'default_get', []) vals.update(self.config.stock_config) wizard_id = self._execute('stock.config.settings', 'create', vals) - return self._execute('stock.config.settings', 'execute', [wizard_id]) + return self._execute('stock.config.settings', 'execute', [wizard_id]) + return True def base_config(self): """Allgemeine Konfiguration laden"""