[MERGE] branch merged with lp:openobject-addons

bzr revid: mtr@tinyerp.com-20110916054138-93b3caomaij5dyp4

1 files changed, 2 insertions, 81 deletions

diff --git a/addons/base_setup/__init__.py b/addons/base_setup/__init__.py
index 9ed5ec84535..82fe6ca3601 100644
--- a/addons/base_setup/__init__.py
+++ b/addons/base_setup/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2011 OpenERP SA (<http://openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -19,85 +19,6 @@
 #
 ##############################################################################
 
-import installer
-import todo
-import wizard
-import os
-import base64
-import random
-import tools
-from osv import fields, osv
-import netsvc
-from tools.translate import _
-
-class base_setup_config_choice(osv.osv_memory):
-    """
-    """
-    _name = 'base.setup.config'
-    logger = netsvc.Logger()
-
-    def _get_image(self, cr, uid, context=None):
-        file_no = str(random.randint(1,3))
-        path = os.path.join('base','res','config_pixmaps/%s.png'%file_no)
-        file_data = tools.file_open(path,'rb').read()
-        return base64.encodestring(file_data)
-
-    def get_users(self, cr, uid, context=None):
-        user_obj = self.pool.get('res.users')
-        user_ids = user_obj.search(cr, uid, [])
-        user_list = []
-        user_tmpl_nopass = _('    - %s :\n\t\tLogin : %s')
-        user_tmpl_pass =   _('    - %s :\n\t\tLogin : %s \n\t\tPassword : %s')
-        for user in user_obj.browse(cr, uid, user_ids, context=context):
-            if user.password and not user.password.startswith('$'):
-                user_list.append(user_tmpl_pass % (user.name, user.login, user.password))
-            else:
-                user_list.append(user_tmpl_nopass % (user.name, user.login))
-        return _('The following users have been installed : \n')+ '\n'.join(user_list)
-
-    _columns = {
-        'installed_users':fields.text('Installed Users', readonly=True),
-        'config_logo' : fields.binary('Image', readonly=True),
-        }
-
-    _defaults = {
-        'installed_users':get_users,
-         'config_logo' : _get_image
-        }
-
-    def reset_menu(self, cr, uid, context=None):
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        menu_id = user._get_menu()
-        user.write({'action_id': False,
-                    'menu_id': menu_id})
-        return self.pool.get('ir.actions.act_window').browse(cr, uid, menu_id, context=context)
-
-    def menu(self, cr, uid, ids, context=None):
-        menu = self.reset_menu(cr, uid, context=context)
-
-        if menu.view_id.id:
-            view_id = (menu.view_id.id, menu.view_id.name)
-        else:
-            view_id = False
-
-        return {
-            'name': menu.name,
-            'type': menu.type,
-            'view_id': view_id,
-            'domain': menu.domain,
-            'res_model': menu.res_model,
-            'src_model': menu.src_model,
-            'view_type': menu.view_type,
-            'view_mode': menu.view_mode,
-            'views': menu.views,
-        }
-
-    def config(self, cr, uid, ids, context=None):
-        self.reset_menu(cr, uid, context=context)
-        return self.pool.get('res.config').next(cr, uid, [], context=context)
-
-base_setup_config_choice()
-
+import base_setup
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-