diff --git a/addons/base_setup/__init__.py b/addons/base_setup/__init__.py
index 82fe6ca3601..e425344e380 100644
--- a/addons/base_setup/__init__.py
+++ b/addons/base_setup/__init__.py
@@ -20,5 +20,6 @@
 ##############################################################################
 
 import base_setup
+import res_config
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_setup/__openerp__.py b/addons/base_setup/__openerp__.py
index 093f2f492ff..343ca8cb286 100644
--- a/addons/base_setup/__openerp__.py
+++ b/addons/base_setup/__openerp__.py
@@ -36,7 +36,7 @@ Shows you a list of applications features to install from.
     'website': 'http://www.openerp.com',
     'depends': ['base'],
     'init_xml': [],
-    'update_xml': ['security/ir.model.access.csv', 'base_setup_views.xml' ],
+    'update_xml': ['security/ir.model.access.csv', 'base_setup_views.xml', 'res_config_view.xml'],
     'demo_xml': [],
     'installable': True,
     'auto_install': True,
diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
new file mode 100644
index 00000000000..f78220e7c8e
--- /dev/null
+++ b/addons/base_setup/res_config.py
@@ -0,0 +1,60 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+
+class general_configuration(osv.osv_memory):
+    _name = 'general.configuration'
+    _inherit = 'res.config.settings'
+    
+    _columns = {
+        'module_multi_company': fields.boolean('Active Multi company',
+                           help ="""It allow to installs the multi_company module."""),
+        'module_portal': fields.boolean('Customer Portal',
+                           help ="""It installs the portal module."""),
+        'module_share': fields.boolean('Share',
+                           help ="""It installs the share module."""),
+    }
+
+    def base_setup_company(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        data_obj = self.pool.get('ir.model.data')
+        user = self.pool.get('res.users').browse(cr, uid, uid)
+        context.update({'res_id': user.company_id.id})
+        company_view_id = data_obj.get_object_reference(cr, uid, 'base', 'view_company_form')
+        if company_view_id:
+            company_view_id = company_view_id and company_view_id[1] or False
+        return {
+            'view_mode': 'form',
+            'view_type': 'form',
+            'res_model': 'res.company',
+            'res_id': int(context.get('res_id')),
+            'views': [(company_view_id, 'form')],
+            'type': 'ir.actions.act_window',
+            'target': 'current',
+            'nodestroy':True,
+            'context': context,
+        }
+
+general_configuration()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
new file mode 100644
index 00000000000..dbfc1d7bae0
--- /dev/null
+++ b/addons/base_setup/res_config_view.xml
@@ -0,0 +1,41 @@
+<openerp>
+    <data>
+
+        <record id="view_general_configuration" model="ir.ui.view">
+            <field name="name">General Application</field>
+            <field name="model">general.configuration</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+	        <form string ="General Application">
+                <separator string="Company Settings" colspan="4"/>
+                <group colspan="4" col="4">
+                    <group colspan="2" col="2">
+                        <label string="Set Company Header and Footer :"/>
+                        <button name="base_setup_company" string="Header and Footer" type="object" icon="gtk-go-forward"/>
+                    </group>
+                    <group colspan="2" col="2">
+                        <field name="module_multi_company"/>
+                    </group>
+                </group>
+                <separator string="Others" colspan="4"/>
+                    <group colspan="4" col="4">
+                       <field name="module_share"/>
+                       <field name="module_portal"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_general_configuration" model="ir.actions.act_window">
+            <field name="name">Configure General Application</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">general.configuration</field>
+            <field name="view_id" ref="view_general_configuration"/>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+        </record>
+
+        <menuitem id="menu_general_configuration" name="General Setting" parent="base.menu_config" sequence="9" action="action_general_configuration"/>
+
+    </data>
+</openerp>