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..360c7afbafc 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..8829d8ef156
--- /dev/null
+++ b/addons/base_setup/res_config.py
@@ -0,0 +1,40 @@
+# -*- 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 = {
+        'group_multi_company': fields.boolean('Active Multi company',
+                           implied_group='base.group_multi_company',
+                           help ="""It allow to set the multi company."""),
+        'module_portal': fields.boolean('Customer Portal',
+                           help ="""It installs the portal module."""),
+        'module_share': fields.boolean('Share',
+                           help ="""It installs the share module."""),
+    }
+
+general_configuration()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
new file mode 100644
index 00000000000..ede184b9aaa
--- /dev/null
+++ b/addons/base_setup/res_config_view.xml
@@ -0,0 +1,37 @@
+<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="General Setting" colspan="4"/>
+                   <group  colspan="2" col="4">
+                        <label string="Set Company Header and Footer" align="0.75" colspan="2"/>
+                        <button name="%(action_base_setup_company)d" string="Header and Footer" type="action" icon="gtk-apply"/>
+                        <newline/>
+                        <field name="group_multi_company"/>
+                        <newline/>
+                        <field name="module_portal"/>
+                        <newline/>
+                        <field name="module_share"/>
+                   </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="13" action="action_general_configuration"/>
+
+    </data>
+</openerp>