[MERGE] Merged with main addons.

bzr revid: tde@openerp.com-20120604080134-t1zg2sv0jpmhbyge

8 files changed, 379 insertions, 127 deletions

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..9e2be5976f6 100644
--- a/addons/base_setup/__openerp__.py
+++ b/addons/base_setup/__openerp__.py
@@ -24,7 +24,6 @@
     'name': 'Initial Setup Tools',
     'version': '1.0',
     'category': 'Hidden',
-    'complexity': "easy",
     'description': """
 This module helps to configure the system at the installation of a new database.
 ================================================================================
@@ -36,7 +35,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/base_setup.py b/addons/base_setup/base_setup.py
index 8dab7273dfd..7a048a50eb4 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -18,7 +18,6 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import pytz
 
 import simplejson
 import cgi
@@ -28,60 +27,6 @@ from osv import fields, osv
 from tools.translate import _
 from lxml import etree
 
-# Define users preferences for new users (ir.values)
-def _lang_get(self, cr, uid, context=None):
-    obj = self.pool.get('res.lang')
-    ids = obj.search(cr, uid, [('translatable','=',True)])
-    res = obj.read(cr, uid, ids, ['code', 'name'], context=context)
-    res = [(r['code'], r['name']) for r in res]
-    return res
-
-def _tz_get(self,cr,uid, context=None):
-    return [(x, x) for x in pytz.all_timezones]
-
-class user_preferences_config(osv.osv_memory):
-    _name = 'user.preferences.config'
-    _inherit = 'res.config'
-    _columns = {
-        'context_tz': fields.selection(_tz_get,  'Timezone', size=64,
-            help="Set default for new user's timezone, used to perform timezone conversions "
-                 "between the server and the client."),
-        'context_lang': fields.selection(_lang_get, 'Language', required=True,
-            help="Sets default language for the all user interface, when UI "
-                "translations are available. If you want to Add new Language, you can add it from 'Load an Official Translation' wizard  from 'Administration' menu."),
-        'view': fields.selection([('simple','Simplified'),
-                                  ('extended','Extended')],
-                                 'Interface', required=True, help= "If you use OpenERP for the first time we strongly advise you to select the simplified interface, which has less features but is easier. You can always switch later from the user preferences." ),
-        'menu_tips': fields.boolean('Display Tips', help="Check out this box if you want to always display tips on each menu action"),
-
-    }
-    _defaults={
-               'view' : lambda self,cr,uid,*args: self.pool.get('res.users').browse(cr, uid, uid).view or 'simple',
-               'context_lang' : 'en_US',
-               'menu_tips' : True
-    }
-
-    def default_get(self, cr, uid, fields, context=None):
-        if context is None:
-            context = {}
-        res = super(user_preferences_config, self).default_get(cr, uid, fields, context=context)
-        res_default = self.pool.get('ir.values').get(cr, uid, 'default', False, ['res.users'])
-        for id, field, value in res_default:
-            res.update({field: value})
-        return res
-
-    def execute(self, cr, uid, ids, context=None):
-        user_obj = self.pool.get('res.users')
-        user_ids = user_obj.search(cr, uid, [], context=context)
-        for o in self.browse(cr, uid, ids, context=context):
-            user_obj.write(cr , uid, user_ids ,{'context_tz' : o.context_tz, 'context_lang' : o.context_lang, 'view' : o.view, 'menu_tips' : o.menu_tips}, context=context)
-            ir_values_obj = self.pool.get('ir.values')
-            ir_values_obj.set(cr, uid, 'default', False, 'context_tz', ['res.users'], o.context_tz)
-            ir_values_obj.set(cr, uid, 'default', False, 'context_lang', ['res.users'], o.context_lang)
-            ir_values_obj.set(cr, uid, 'default', False, 'view', ['res.users'], o.view)
-            ir_values_obj.set(cr, uid, 'default', False, 'menu_tips', ['res.users'], o.menu_tips)
-        return {}
-
 # Specify Your Terminology will move to 'partner' module
 class specify_partner_terminology(osv.osv_memory):
     _name = 'base.setup.terminology'
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index f7562a796f2..b0b533d78e1 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -1,51 +1,5 @@
 <openerp>
   <data>
-     <!-- Define default users preferences-->
-     <record id="view_user_preferences_config_form" model="ir.ui.view">
-          <field name="name">Set default users preferences</field>
-          <field name="model">user.preferences.config</field>
-          <field name="type">form</field>
-          <field name="inherit_id" ref="base.res_config_view_base"/>
-          <field name="arch" type="xml">
-            <data>
-              <form position="attributes">
-                <attribute name="string">Define Users's Preferences</attribute>
-              </form>
-            <xpath expr="//separator[@string=&quot;title&quot;]" position="attributes">
-                  <attribute name="string">Define Users's Preferences</attribute>
-            </xpath>
-            <xpath expr="//label[@string='description']" position="attributes">
-              <attribute name="string">This will set the default preferences for new users and update all existing ones. Afterwards, users are free to change those values on their own user preference form.</attribute>
-            </xpath>
-            <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
-                  <attribute name="string"/>
-                  <attribute name="rowspan">12</attribute>
-            </xpath>
-             <group string="res_config_contents" position="replace">
-                    <group colspan="4">
-                        <field colspan="4" name="view"/>
-                        <field colspan="4" name="context_lang"/>
-                        <field colspan="4" name="context_tz"/>
-                        <field colspan="4" name="menu_tips"/>
-                  </group>
-              </group>
-            </data>
-          </field>
-      </record>
-      <record id="action_user_preferences_config_form" model="ir.actions.act_window">
-          <field name="name">Define default users preferences</field>
-          <field name="type">ir.actions.act_window</field>
-          <field name="res_model">user.preferences.config</field>
-          <field name="view_type">form</field>
-          <field name="view_id" ref="view_user_preferences_config_form"/>
-          <field name="view_mode">form</field>
-          <field name="target">new</field>
-      </record>
-      <record id="config_action_user_preferences_config_form" model="ir.actions.todo">
-          <field name="action_id" ref="action_user_preferences_config_form"/>
-          <field name="category_id" ref="base.category_administration_config"/>
-          <field name="type">once</field>
-      </record>
 
       <!--   Specify Your Terminology Config Wiz-->
      <record id="base_setup_terminology_form" model="ir.ui.view">
@@ -86,23 +40,6 @@
           <field name="target">new</field>
       </record>
 
-    <!-- Company config -->
-    <record id="action_base_setup_company" model="ir.actions.act_window">
-      <field name="name">Set Company Header and Footer</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="res_model">res.company</field>
-      <field name="view_id" ref="base.view_company_form"/>
-      <field name="view_type">form</field>
-      <field name="view_mode">form</field>
-      <field name="context">{'res_id': user.company_id.id}</field>
-      <field name="help">Fill in your company data (address, logo, bank accounts) so that it's printed on your reports. You can click on the button 'Preview Header' in order to check the header/footer of PDF documents.</field>
-    </record>
-    <record id="base_setup_company_todo" model="ir.actions.todo">
-        <field name="action_id" ref="action_base_setup_company"/>
-        <field name="category_id" ref="base.category_administration_config"/>
-        <field name="sequence">1</field>
-    </record>
-
     <record id="base.view_sale_config_settings" model="ir.ui.view">
         <field name="name">sale settings</field>
         <field name="model">sale.config.settings</field>
@@ -116,6 +53,7 @@
                 <sheet layout="auto">
                     <group>
                         <group name="config_sale" colspan="4"/>
+
                         <!-- this part is necessary to allow the plugins to extend the view -->
                         <field name="module_crm" invisible="1"/>
                         <group name="config_fetchmail" colspan="4" attrs="{'invisible': [('module_crm','=',False)]}">
diff --git a/addons/base_setup/i18n/gu.po b/addons/base_setup/i18n/gu.po
new file mode 100644
index 00000000000..3563c7da2ff
--- /dev/null
+++ b/addons/base_setup/i18n/gu.po
@@ -0,0 +1,282 @@
+# Gujarati translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-05-31 11:08+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Gujarati <gu@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-06-01 05:32+0000\n"
+"X-Generator: Launchpad (build 15342)\n"
+
+#. module: base_setup
+#: field:user.preferences.config,menu_tips:0
+msgid "Display Tips"
+msgstr ""
+
+#. module: base_setup
+#: selection:base.setup.terminology,partner:0
+msgid "Guest"
+msgstr "અતિથિ"
+
+#. module: base_setup
+#: model:ir.model,name:base_setup.model_product_installer
+msgid "product.installer"
+msgstr ""
+
+#. module: base_setup
+#: selection:product.installer,customers:0
+msgid "Create"
+msgstr "બનાવો"
+
+#. module: base_setup
+#: selection:base.setup.terminology,partner:0
+msgid "Member"
+msgstr "સભ્ય"
+
+#. module: base_setup
+#: field:migrade.application.installer.modules,sync_google_contact:0
+msgid "Sync Google Contact"
+msgstr ""
+
+#. module: base_setup
+#: help:user.preferences.config,context_tz:0
+msgid ""
+"Set default for new user's timezone, used to perform timezone conversions "
+"between the server and the client."
+msgstr ""
+
+#. module: base_setup
+#: selection:product.installer,customers:0
+msgid "Import"
+msgstr "આયાત કરો"
+
+#. module: base_setup
+#: selection:base.setup.terminology,partner:0
+msgid "Donor"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.actions.act_window,name:base_setup.action_base_setup_company
+msgid "Set Company Header and Footer"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.actions.act_window,help:base_setup.action_base_setup_company
+msgid ""
+"Fill in your company data (address, logo, bank accounts) so that it's "
+"printed on your reports. You can click on the button 'Preview Header' in "
+"order to check the header/footer of PDF documents."
+msgstr ""
+
+#. module: base_setup
+#: field:product.installer,customers:0
+msgid "Customers"
+msgstr "ગ્રાહકો"
+
+#. module: base_setup
+#: selection:user.preferences.config,view:0
+msgid "Extended"
+msgstr "વિસ્તૃત"
+
+#. module: base_setup
+#: selection:base.setup.terminology,partner:0
+msgid "Patient"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.actions.act_window,help:base_setup.action_import_create_installer
+msgid ""
+"Create or Import Customers  and their contacts manually from this form or "
+"you can import your existing partners by CSV spreadsheet from \"Import "
+"Data\" wizard"
+msgstr ""
+
+#. module: base_setup
+#: view:user.preferences.config:0
+msgid "Define Users's Preferences"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
+msgid "Define default users preferences"
+msgstr ""
+
+#. module: base_setup
+#: help:migrade.application.installer.modules,import_saleforce:0
+msgid "For Import Saleforce"
+msgstr ""
+
+#. module: base_setup
+#: help:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "For Quickbooks Ippids"
+msgstr ""
+
+#. module: base_setup
+#: help:user.preferences.config,view:0
+msgid ""
+"If you use OpenERP for the first time we strongly advise you to select the "
+"simplified interface, which has less features but is easier. You can always "
+"switch later from the user preferences."
+msgstr ""
+
+#. module: base_setup
+#: view:base.setup.terminology:0
+#: view:user.preferences.config:0
+msgid "res_config_contents"
+msgstr ""
+
+#. module: base_setup
+#: field:user.preferences.config,view:0
+msgid "Interface"
+msgstr "ઇન્ટરફેસ"
+
+#. module: base_setup
+#: model:ir.model,name:base_setup.model_migrade_application_installer_modules
+msgid "migrade.application.installer.modules"
+msgstr ""
+
+#. module: base_setup
+#: view:base.setup.terminology:0
+msgid ""
+"You can use this wizard to change the terminologies for customers in the "
+"whole application."
+msgstr ""
+
+#. module: base_setup
+#: selection:base.setup.terminology,partner:0
+msgid "Tenant"
+msgstr ""
+
+#. module: base_setup
+#: selection:base.setup.terminology,partner:0
+msgid "Customer"
+msgstr ""
+
+#. module: base_setup
+#: field:user.preferences.config,context_lang:0
+msgid "Language"
+msgstr "ભાષા"
+
+#. module: base_setup
+#: help:user.preferences.config,context_lang:0
+msgid ""
+"Sets default language for the all user interface, when UI translations are "
+"available. If you want to Add new Language, you can add it from 'Load an "
+"Official Translation' wizard  from 'Administration' menu."
+msgstr ""
+
+#. module: base_setup
+#: view:user.preferences.config:0
+msgid ""
+"This will set the default preferences for new users and update all existing "
+"ones. Afterwards, users are free to change those values on their own user "
+"preference form."
+msgstr ""
+
+#. module: base_setup
+#: field:base.setup.terminology,partner:0
+msgid "How do you call a Customer"
+msgstr ""
+
+#. module: base_setup
+#: field:migrade.application.installer.modules,quickbooks_ippids:0
+msgid "Quickbooks Ippids"
+msgstr ""
+
+#. module: base_setup
+#: selection:base.setup.terminology,partner:0
+msgid "Client"
+msgstr ""
+
+#. module: base_setup
+#: field:migrade.application.installer.modules,import_saleforce:0
+msgid "Import Saleforce"
+msgstr ""
+
+#. module: base_setup
+#: field:user.preferences.config,context_tz:0
+msgid "Timezone"
+msgstr "ટાઈમઝોન"
+
+#. module: base_setup
+#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
+msgid "Use another word to say \"Customer\""
+msgstr ""
+
+#. module: base_setup
+#: model:ir.model,name:base_setup.model_base_setup_terminology
+msgid "base.setup.terminology"
+msgstr ""
+
+#. module: base_setup
+#: help:user.preferences.config,menu_tips:0
+msgid ""
+"Check out this box if you want to always display tips on each menu action"
+msgstr ""
+
+#. module: base_setup
+#: field:base.setup.terminology,config_logo:0
+#: field:migrade.application.installer.modules,config_logo:0
+#: field:product.installer,config_logo:0
+#: field:user.preferences.config,config_logo:0
+msgid "Image"
+msgstr "ચિત્ર"
+
+#. module: base_setup
+#: model:ir.model,name:base_setup.model_user_preferences_config
+msgid "user.preferences.config"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
+msgid "Create Additional Users"
+msgstr ""
+
+#. module: base_setup
+#: model:ir.actions.act_window,name:base_setup.action_import_create_installer
+msgid "Create or Import Customers"
+msgstr ""
+
+#. module: base_setup
+#: field:migrade.application.installer.modules,import_sugarcrm:0
+msgid "Import Sugarcrm"
+msgstr ""
+
+#. module: base_setup
+#: help:product.installer,customers:0
+msgid "Import or create customers"
+msgstr ""
+
+#. module: base_setup
+#: selection:user.preferences.config,view:0
+msgid "Simplified"
+msgstr "સરળ"
+
+#. module: base_setup
+#: help:migrade.application.installer.modules,import_sugarcrm:0
+msgid "For Import Sugarcrm"
+msgstr ""
+
+#. module: base_setup
+#: selection:base.setup.terminology,partner:0
+msgid "Partner"
+msgstr "ભાગીદાર"
+
+#. module: base_setup
+#: view:base.setup.terminology:0
+msgid "Specify Your Terminology"
+msgstr ""
+
+#. module: base_setup
+#: help:migrade.application.installer.modules,sync_google_contact:0
+msgid "For Sync Google Contact"
+msgstr ""
diff --git a/addons/base_setup/i18n/ja.po b/addons/base_setup/i18n/ja.po
index 1c8714f4031..5cc2296cbcf 100644
--- a/addons/base_setup/i18n/ja.po
+++ b/addons/base_setup/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-07 05:42+0000\n"
+"PO-Revision-Date: 2012-05-23 09:07+0000\n"
 "Last-Translator: Tomomi Mengelberg <tomomi.mengelberg@aquasys.co.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-08 04:49+0000\n"
-"X-Generator: Launchpad (build 15204)\n"
+"X-Launchpad-Export-Date: 2012-05-24 11:08+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
@@ -52,7 +52,7 @@ msgstr "Googleの連絡先を同期する。"
 msgid ""
 "Set default for new user's timezone, used to perform timezone conversions "
 "between the server and the client."
-msgstr ""
+msgstr "新規ユーザのタイムゾーンのデフォルト設定のために、サーバとクライアント間のタイムゾーンの変換をします。"
 
 #. module: base_setup
 #: selection:product.installer,customers:0
@@ -76,6 +76,8 @@ msgid ""
 "printed on your reports. You can click on the button 'Preview Header' in "
 "order to check the header/footer of PDF documents."
 msgstr ""
+"レポートに印刷されますので、会社のデータ（アドレス、ロゴ、銀行口座）を記入してください。　PDF "
+"ドキュメントのヘッダー/フッターを確認するには、\"ヘッダープレビュー\"をクリックします。"
 
 #. module: base_setup
 #: field:product.installer,customers:0
@@ -99,6 +101,8 @@ msgid ""
 "you can import your existing partners by CSV spreadsheet from \"Import "
 "Data\" wizard"
 msgstr ""
+"このフォームから手動で顧客とその連絡先を作成またはインポート或いは "
+"\"データのインポート\"ウィザードからCSVスプレッドシートで、既存のパートナーをインポートすることができます。"
 
 #. module: base_setup
 #: view:user.preferences.config:0
@@ -113,7 +117,7 @@ msgstr "ユーザのプリファレンスを初期値に定義します。"
 #. module: base_setup
 #: help:migrade.application.installer.modules,import_saleforce:0
 msgid "For Import Saleforce"
-msgstr ""
+msgstr "Salesforceのインポート"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,quickbooks_ippids:0
@@ -149,7 +153,7 @@ msgstr "migrade.application.installer.modules"
 msgid ""
 "You can use this wizard to change the terminologies for customers in the "
 "whole application."
-msgstr ""
+msgstr "アプリケーション全体の顧客の用語を変更するには、このウィザードを使用することができます。"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -173,6 +177,8 @@ msgid ""
 "available. If you want to Add new Language, you can add it from 'Load an "
 "Official Translation' wizard  from 'Administration' menu."
 msgstr ""
+"UI翻訳が利用可能な時は、既定の言語を全てのユーザインターフェースに設定します。新しい言語を追加する場合は、\"管理\" "
+"メニューのウィザード\"オフィシャル翻訳をロードする' から追加することができます。"
 
 #. module: base_setup
 #: view:user.preferences.config:0
@@ -210,7 +216,7 @@ msgstr "タイムゾーン"
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
 msgid "Use another word to say \"Customer\""
-msgstr ""
+msgstr "\"顧客\"を言い表す他の言葉を使用してください。"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
new file mode 100644
index 00000000000..92914f8f7a3
--- /dev/null
+++ b/addons/base_setup/res_config.py
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (C) 2004-2012 OpenERP S.A. (<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
+#    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 osv, fields
+
+class base_config_settings(osv.osv_memory):
+    _name = 'base.config.settings'
+    _inherit = 'res.config.settings'
+    _columns = {
+        'module_multi_company': fields.boolean('Multi Company',
+            help="""Work in multi-company environments, with appropriate security access between companies.
+                This installs the module multi_company."""),
+        'module_portal': fields.boolean('Portal',
+            help="""Define a portal for your customers or suppliers.  The portal is a group of
+                external users that has specific access rights and rules.
+                This installs the module portal."""),
+        'module_share': fields.boolean('Share',
+            help="""Share OpenERP documents (records) with external users.
+                This installs the module share."""),
+    }
+
+# 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..0281263397a
--- /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 Settings</field>
+            <field name="model">base.config.settings</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="General Settings" layout="manual">
+                    <div class="oe_form_topbar">
+                        <button string="Apply" type="object" name="execute"/>
+                        <button string="Cancel" special="cancel"/>
+                    </div>
+                    <sheet layout="auto">
+                        <separator string="Company Settings" colspan="4"/>
+                        <field name="module_multi_company"/>
+
+                        <separator string="Others" colspan="4"/>
+                        <label string="Outgoing Mail Servers"/>
+                        <button type="action" name="%(base.action_ir_mail_server_list)d"
+                            string="Configure" icon="gtk-execute"/>
+                        <newline/>
+                        <field name="module_share"/>
+                        <newline/>
+                        <field name="module_portal"/>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_general_configuration" model="ir.actions.act_window">
+            <field name="name">General Settings</field>
+            <field name="res_model">base.config.settings</field>
+            <field name="view_mode">form</field>
+            <field name="target">inline</field>
+        </record>
+        <menuitem id="menu_general_configuration" parent="base.menu_config"
+            sequence="100" action="action_general_configuration"/>
+
+    </data>
+</openerp>