From d72bf86b594065de21f8eea82f3924981ef75392 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Wed, 5 Oct 2011 18:52:02 +0200 Subject: [PATCH] [FIX] category selection bzr revid: al@openerp.com-20111005165202-s3jv23v7n5py4mx1 --- addons/base_setup/base_setup.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py index 9efc82f2d62..312e20c0ffd 100644 --- a/addons/base_setup/base_setup.py +++ b/addons/base_setup/base_setup.py @@ -101,10 +101,13 @@ class base_setup_installer(osv.osv_memory): module_ids = module_proxy.search(cr, uid, [], context=context) for module in module_proxy.browse(cr, uid, module_ids, context=context): result['module_%d' % (module.id,)] = module.state == 'installed' - category_name = 'category_%d' % (module.category_id.id,) - if not result.get('category_name'): - result[category_name] = module.state == 'installed' and \ - module.category_id.name in DEFAULT_MODULES + + cat_proxy = self.pool.get('ir.module.category') + cat_ids = cat_proxy.search(cr, uid, [], context=context) + for cat in cat_proxy.browse(cr, uid, cat_ids, context=context): + m = DEFAULT_MODULES.get(cat.name,[]) + r = module_proxy.search(cr, uid, [('state','=','installed'),('name','in',m)]) + result['category_%d' % (cat.id,)] = bool(r) return result @@ -330,10 +333,6 @@ class base_setup_installer(osv.osv_memory): # if need_install: # self.pool = pooler.restart_pool(cr.dbname, update_module=True)[1] # return -base_setup_installer() - - - #Migrate data from another application Conf wiz @@ -356,7 +355,6 @@ class product_installer(osv.osv_memory): _inherit = 'res.config' _columns = { 'customers': fields.selection([('create','Create'), ('import','Import')], 'Customers', size=32, required=True, help="Import or create customers"), - } _defaults = { 'customers': 'create',