[MERGE] merge with main addons

bzr revid: psi@tinyerp.com-20120806061113-1ck1nrda2sdq06im

9 files changed, 242 insertions, 112 deletions

diff --git a/addons/base_setup/__openerp__.py b/addons/base_setup/__openerp__.py
index 35505ea853f..cf69933c84a 100644
--- a/addons/base_setup/__openerp__.py
+++ b/addons/base_setup/__openerp__.py
@@ -33,13 +33,19 @@ Shows you a list of applications features to install from.
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    'depends': ['base'],
-    'init_xml': [],
-    'update_xml': ['security/ir.model.access.csv', 'base_setup_views.xml', 'res_config_view.xml'],
-    'demo_xml': [],
+    'depends': ['base', 'web_kanban'],
+    'data': [
+        'security/ir.model.access.csv',
+        'base_setup_views.xml',
+        'res_config_view.xml',
+        'res_partner_view.xml',
+    ],
+    'demo': [],
     'installable': True,
     'auto_install': False,
     'certificate': '0086711085869',
     'images': ['images/base_setup1.jpeg','images/base_setup2.jpeg','images/base_setup3.jpeg','images/base_setup4.jpeg',],
+    'js': ['static/src/js/base_setup.js'],
+    'css': ['static/src/css/base_setup.css'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 8be9aa0e2e3..0db6c173d9b 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -1,47 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
 <openerp>
-  <data>
+    <data>
 
-    <!-- Show menus that are hidden in module base -->
-    <record id="base.menu_res_company_global" model="ir.ui.menu">
-        <field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/>
-    </record>
-    <record id="base.menu_users" model="ir.ui.menu">
-        <field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/>
-    </record>
-    <record id="base.menu_publisher_warranty" model="ir.ui.menu">
-        <field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/>
-    </record>
+        <!-- Show menus that are hidden in module base -->
+        <record id="base.menu_res_company_global" model="ir.ui.menu">
+            <field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/>
+        </record>
+        <record id="base.menu_users" model="ir.ui.menu">
+            <field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/>
+        </record>
+        <record id="base.menu_publisher_warranty" model="ir.ui.menu">
+            <field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/>
+        </record>
 
-      <!--   Specify Your Terminology Config Wiz-->
-     <record id="base_setup_terminology_form" model="ir.ui.view">
-          <field name="name">Specify Your Terminology</field>
-          <field name="model">base.setup.terminology</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" version="7.0">
-                <attribute name="string">Specify Your Terminology</attribute>
-              </form>
-             <group string="res_config_contents" position="replace">
-                 <label string="You can use this wizard to change the terminologies for customers in the whole application."/>
-                    <separator string="Specify Your Terminology"/>
-                    <group colspan="4">
-                        <field colspan="4" name="partner"/>
-                  </group>
-              </group>
-            </data>
-          </field>
-      </record>
-      <record id="action_partner_terminology_config_form" model="ir.actions.act_window">
-          <field name="name">Use another word to say "Customer"</field>
-          <field name="type">ir.actions.act_window</field>
-          <field name="res_model">base.setup.terminology</field>
-          <field name="view_type">form</field>
-          <field name="view_id" ref="base_setup_terminology_form"/>
-          <field name="view_mode">form</field>
-          <field name="target">new</field>
-      </record>
+        <!-- Specify your terminology config wiz -->
+        <record id="base_setup_terminology_form" model="ir.ui.view">
+            <field name="name">Specify Your Terminology</field>
+            <field name="model">base.setup.terminology</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" version="7.0">
+                        <attribute name="string">Specify Your Terminology</attribute>
+                    </form>
+                    <group string="res_config_contents" position="replace">
+                        <label string="You can use this wizard to change the terminologies for customers in the whole application."/>
+                        <separator string="Specify Your Terminology"/>
+                        <group colspan="4">
+                            <field colspan="4" name="partner"/>
+                        </group>
+                    </group>
+                </data>
+            </field>
+        </record>
+        <record id="action_partner_terminology_config_form" model="ir.actions.act_window">
+            <field name="name">Use another word to say "Customer"</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">base.setup.terminology</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="base_setup_terminology_form"/>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
 
-  </data>
+    </data>
 </openerp>
diff --git a/addons/base_setup/i18n/ja.po b/addons/base_setup/i18n/ja.po
index c879a913093..ac2b7f9dc7b 100644
--- a/addons/base_setup/i18n/ja.po
+++ b/addons/base_setup/i18n/ja.po
@@ -8,19 +8,19 @@ 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-07-12 01:34+0000\n"
+"PO-Revision-Date: 2012-07-28 21:52+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\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-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
 msgid "Display Tips"
-msgstr "ヒントを表示する。"
+msgstr "ヒントの表示"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -45,7 +45,7 @@ msgstr "メンバー"
 #. module: base_setup
 #: field:migrade.application.installer.modules,sync_google_contact:0
 msgid "Sync Google Contact"
-msgstr "Googleの連絡先を同期する。"
+msgstr "Googleコンタクトの同期"
 
 #. module: base_setup
 #: help:user.preferences.config,context_tz:0
@@ -57,7 +57,7 @@ msgstr "新規ユーザのタイムゾーンのデフォルト設定のために
 #. module: base_setup
 #: selection:product.installer,customers:0
 msgid "Import"
-msgstr "取り込む"
+msgstr "インポート"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -67,7 +67,7 @@ msgstr "提供者"
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_company
 msgid "Set Company Header and Footer"
-msgstr "会社のヘッダーとフッターを設定します。"
+msgstr "会社ヘッダーとフッターの設定"
 
 #. module: base_setup
 #: model:ir.actions.act_window,help:base_setup.action_base_setup_company
@@ -76,8 +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 "
-"ドキュメントのヘッダー/フッターを確認するには、\"ヘッダープレビュー\"をクリックします。"
+"レポートに印刷される会社のデータ（アドレス、ロゴ、銀行口座）を記入して下さい。PDF "
+"ドキュメントのヘッダー/フッターを確認するには、ヘッダープレビューをクリックします。"
 
 #. module: base_setup
 #: field:product.installer,customers:0
@@ -102,7 +102,7 @@ msgid ""
 "Data\" wizard"
 msgstr ""
 "このフォームから手動で顧客とその連絡先を作成またはインポート或いは "
-"\"データのインポート\"ウィザードからCSVスプレッドシートで、既存のパートナーをインポートすることができます。"
+"\"データのインポート\"ウィザードからCSVスプレッドシートで、既存のパートナをインポートすることができます。"
 
 #. module: base_setup
 #: view:user.preferences.config:0
@@ -112,7 +112,7 @@ msgstr "ユーザのプリファレンスを定義します。"
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
 msgid "Define default users preferences"
-msgstr "ユーザのプリファレンスを初期値に定義します。"
+msgstr "デフォルトのユーザプリファレンスの設定"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,import_saleforce:0
@@ -131,8 +131,7 @@ msgid ""
 "simplified interface, which has less features but is easier. You can always "
 "switch later from the user preferences."
 msgstr ""
-"初めてopenERPを利用する場合は、簡素化されたインターフェイスを選択されることをお勧めします。設定後いつでもユーザープリファレンスから設定変更ができま"
-"す。"
+"初めてopenERPを利用する場合は、簡素化されたインタフェースを選択されることをお勧めします。設定後いつでもユーザプリファレンスから切り替えができます。"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
@@ -143,7 +142,7 @@ msgstr "res_config_contents"
 #. module: base_setup
 #: field:user.preferences.config,view:0
 msgid "Interface"
-msgstr "インターフェース"
+msgstr "インタフェース"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_migrade_application_installer_modules
@@ -160,7 +159,7 @@ msgstr "アプリケーション全体の顧客の用語を変更するには、
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Tenant"
-msgstr "占有者"
+msgstr "テナント"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -179,8 +178,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翻訳が利用可能な時は、既定の言語を全てのユーザインターフェースに設定します。新しい言語を追加する場合は、\"管理\" "
-"メニューのウィザード\"オフィシャル翻訳をロードする' から追加することができます。"
+"UI翻訳が利用可能な時は、既定の言語を全てのユーザインタフェースに設定します。新しい言語を追加する場合は、\"管理\" "
+"メニューのウィザード\"オフィシャル翻訳のロード\"から追加することができます。"
 
 #. module: base_setup
 #: view:user.preferences.config:0
@@ -189,8 +188,7 @@ msgid ""
 "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
@@ -274,7 +272,7 @@ msgstr "簡易化"
 #. module: base_setup
 #: help:migrade.application.installer.modules,import_sugarcrm:0
 msgid "For Import Sugarcrm"
-msgstr "SugarCRMを取り込むために"
+msgstr "SugarCRMのインポートのため"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -284,9 +282,9 @@ msgstr "パートナ"
 #. module: base_setup
 #: view:base.setup.terminology:0
 msgid "Specify Your Terminology"
-msgstr "用語を指定します。"
+msgstr "用語の定義"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,sync_google_contact:0
 msgid "For Sync Google Contact"
-msgstr "Googleの連絡先を同期するために"
+msgstr "Googleコンタクトとの同期のため"
diff --git a/addons/base_setup/i18n/pt_BR.po b/addons/base_setup/i18n/pt_BR.po
index 43313b581e8..9e1204b9e24 100644
--- a/addons/base_setup/i18n/pt_BR.po
+++ b/addons/base_setup/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-26 22:45+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2012-07-28 19:07+0000\n"
+"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 05:50+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n"
+"X-Generator: Launchpad (build 15694)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
@@ -52,6 +52,8 @@ msgid ""
 "Set default for new user's timezone, used to perform timezone conversions "
 "between the server and the client."
 msgstr ""
+"Defina o padrão para a timezone de novos usuários, usado para fazer "
+"conversões de timezones entre servidor e cliente."
 
 #. module: base_setup
 #: selection:product.installer,customers:0
@@ -61,7 +63,7 @@ msgstr "Importar"
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Donor"
-msgstr ""
+msgstr "Doador"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_company
@@ -75,6 +77,9 @@ msgid ""
 "printed on your reports. You can click on the button 'Preview Header' in "
 "order to check the header/footer of PDF documents."
 msgstr ""
+"Preencha os dados da empresa (Endereço, logo, contas bancárias) para que "
+"seja exibido em seus relatórios. Você pode clicar no botão \"Visualizar "
+"Cabeçalho\" para verificar o cabeçalho/rodapé dos documentos PDF"
 
 #. module: base_setup
 #: field:product.installer,customers:0
@@ -98,6 +103,9 @@ msgid ""
 "you can import your existing partners by CSV spreadsheet from \"Import "
 "Data\" wizard"
 msgstr ""
+"Crie ou importe clientes e seus contatos manualmente a partir deste "
+"formulário, ou você pode importar seus parceiros existentes por planilhas "
+"CSV através do assistente \"Importar Dados\""
 
 #. module: base_setup
 #: view:user.preferences.config:0
@@ -112,12 +120,12 @@ msgstr "Define as Preferências Padrão dos Usuários"
 #. module: base_setup
 #: help:migrade.application.installer.modules,import_saleforce:0
 msgid "For Import Saleforce"
-msgstr ""
+msgstr "Importar do Saleforce"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,quickbooks_ippids:0
 msgid "For Quickbooks Ippids"
-msgstr ""
+msgstr "Para Quickbooks Ippids"
 
 #. module: base_setup
 #: help:user.preferences.config,view:0
@@ -152,11 +160,13 @@ msgid ""
 "You can use this wizard to change the terminologies for customers in the "
 "whole application."
 msgstr ""
+"Você pode usar este assistente para mudar as terminologias para clientes em "
+"toda a aplicação"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Tenant"
-msgstr ""
+msgstr "Locatário"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -175,6 +185,10 @@ msgid ""
 "available. If you want to Add new Language, you can add it from 'Load an "
 "Official Translation' wizard  from 'Administration' menu."
 msgstr ""
+"Defina o idioma padrão para toda a interface de usuário, quando traduções de "
+"UI estiverem disponíveis. Se você quiser adicionar um novo idioma, você pode "
+"adicionar pelo assistente \"Carregar uma tradução oficial\" do menu de "
+"administrador"
 
 #. module: base_setup
 #: view:user.preferences.config:0
@@ -183,16 +197,19 @@ msgid ""
 "ones. Afterwards, users are free to change those values on their own user "
 "preference form."
 msgstr ""
+"Isto irá definir as preferências padrões para novos usuários e atualizar "
+"todos os existentes. Após isso, os usuários são livres para alterarem esses "
+"valores para suas próprias preferencias"
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
 msgid "How do you call a Customer"
-msgstr ""
+msgstr "Como você chama um Cliente"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,quickbooks_ippids:0
 msgid "Quickbooks Ippids"
-msgstr ""
+msgstr "Quickbooks Ippids"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -202,7 +219,7 @@ msgstr "Cliente"
 #. module: base_setup
 #: field:migrade.application.installer.modules,import_saleforce:0
 msgid "Import Saleforce"
-msgstr ""
+msgstr "Importar Saleforce"
 
 #. module: base_setup
 #: field:user.preferences.config,context_tz:0
@@ -212,7 +229,7 @@ msgstr "Fuso Horário"
 #. 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 "Use uma outra palavra para dizer \"Cliente\""
 
 #. 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
index 6a73eb786ea..7e85925b1c9 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -25,12 +25,12 @@ class base_config_settings(osv.osv_memory):
     _name = 'base.config.settings'
     _inherit = 'res.config.settings'
     _columns = {
-        'module_multi_company': fields.boolean('Multi Company',
+        'module_multi_company': fields.boolean('manage multiple companies',
             help="""Work in multi-company environments, with appropriate security access between companies.
                 This installs the module multi_company."""),
-        'module_portal': fields.boolean('Activate Customer Portal',
+        'module_portal': fields.boolean('activate customer portal',
             help="""The portal will give access to a series of documents for your  customers; his quotations, his invoices, his projects, etc."""),
-        'module_share': fields.boolean('Allow Sharing Resources to External Users',
+        'module_share': fields.boolean('allow documents sharing',
             help="""As an example, you will be able to share a project or some tasks to  your customers, or quotes/sales to several persons at your customer  company, or your agenda availabilities to your contacts."""),
     }
 
@@ -54,14 +54,14 @@ class sale_config_settings(osv.osv_memory):
     _inherit = 'res.config.settings'
     _columns = {
         'module_crm': fields.boolean('CRM'),
-        'module_plugin_thunderbird': fields.boolean('Thunderbird Plugin',
+        'module_plugin_thunderbird': fields.boolean('enable Thunderbird plugin',
             help="""The plugin allows you archive email and its attachments to the selected
                 OpenERP objects. You can select a partner, or a lead and
                 attach the selected mail as a .eml file in
                 the attachment of a selected record. You can create documents for CRM Lead,
                 Partner from the selected emails.
                 This installs the module plugin_thunderbird."""),
-        'module_plugin_outlook': fields.boolean('Outlook Plugin',
+        'module_plugin_outlook': fields.boolean('enable Outlook plugin',
             help="""The Outlook plugin allows you to select an object that you would like to add
                 to your email and its attachments from MS Outlook. You can select a partner,
                 or a lead object and archive a selected
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 5227b0885a9..f4c1f1ad08b 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
 
@@ -6,31 +7,45 @@
             <field name="model">base.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="General Settings" version="7.0">
+                <form string="General Settings" version="7.0" class="oe_form_configuration">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
+                    <separator string="General Settings"/>
+                    <div>
+                        <label string="You will also find several configuration options on your company data:
+                            address for the header and footer, overdue payments texts, etc."/>
+                        <button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute" class="oe_inline oe_link"/>
+                    </div>
                     <group>
-                        <group string="Company Settings">
-                            <field name="module_multi_company"/>
-                            <separator string="External Accesses" colspan="2"/>
-                            <field name="module_share"/>
-                            <field name="module_portal"/>
-                        </group>
-                        <group>
+                        <label for="id" string="Options"/>
+                        <div>
+                            <div name="multi_company">
+                                <field name="module_multi_company" class="oe_inline"/>
+                                <label for="module_multi_company"/>
+                            </div>
+                        </div>
+                    </group>
+                    <group>
+                        <label for="id" string="Share Data"/>
+                        <div>
                             <div>
-                                You will also find several configuration options on your company data:
-                                address for the header and footer, overdue payments texts, etc.
+                                <field name="module_share" class="oe_inline"/>
+                                <label for="module_share"/>
                             </div>
-                            <button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute"/>
-                            <separator string="Others" colspan="2"/>
-                            <label for="id" string="Outgoing Mail Servers"/>
-                            <button type="action" name="%(base.action_ir_mail_server_list)d"
-                            string="Configure" icon="gtk-execute"/>
-                        </group>
-                        
+                            <div>
+                                <field name="module_portal" class="oe_inline"/>
+                                <label for="module_portal"/>
+                            </div>
+                            <div>
+                                <label string="Configure outgoing email servers"/>
+                                <button type="action"
+                                    name="%(base.action_ir_mail_server_list)d"
+                                    string="Configure" icon="gtk-execute" class="oe_link"/>
+                            </div>
+                        </div>
                     </group>
                 </form>
             </field>
@@ -51,22 +66,47 @@
             <field name="model">sale.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Sales" version="7.0">
+                <form string="Configure Sales" version="7.0" class="oe_form_configuration">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                        <group>
-                            <group name="config_sale">
-                                <field name="module_crm" invisible="1"/>
-                                <separator string="Emails" colspan="2" attrs="{'invisible': [('module_crm','=',False)]}"/>
-                                <field name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}"/>
-                                <field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"/>
-                            </group>
-                            <group name="config_other">
-                            </group>
+                    <div name="customer feature">
+                        <separator string="Quotations and Sales Orders"/>
+                        <group name="Customer">
+                            <label for="id" string="Customer Features"/>
+                            <div name="Customer Features"/>
+                        </group>
+                        <group name="Sale">
+                            <label for="id" string="Sale Features"/>
+                            <div name="Sale Features"/>
+                        </group>
+                    </div>
+                    <div name="config_sale">
+                        <field name="module_crm" invisible="1"/>
+                        <separator string="Emails Integration" attrs="{'invisible': [('module_crm','=',False)]}"/>
+                        <p attrs="{'invisible': [('module_crm','=',False)]}">
+                            OpenERP allows to automatically create leads (or others documents)
+                            from incoming emails. You can synchronize emails with OpenERP
+                            by connecting the mail gateway to your mail server or by manually
+                            pressing buttons in our mail clients.
+                        </p>
+                        <group name="On Mail Client" attrs="{'invisible': [('module_crm','=',False)]}">
+                            <label for="id" string="On Mail Client"/>
+                            <div>
+                                <div name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}" class="oe_inline">
+                                    <field name="module_plugin_thunderbird"/>
+                                    <label for="module_plugin_thunderbird"/>
+                                </div>
+                                <div name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}">
+                                    <field name="module_plugin_outlook" class="oe_inline"/>
+                                    <label for="module_plugin_outlook"/>
+                                </div>
+                            </div>
                         </group>
+                    </div>
+                    <div name="config_other"/>
                 </form>
             </field>
         </record>
diff --git a/addons/base_setup/res_partner_view.xml b/addons/base_setup/res_partner_view.xml
new file mode 100644
index 00000000000..5aa24b3474d
--- /dev/null
+++ b/addons/base_setup/res_partner_view.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- Add partner categories in partner kanban view -->
+        <record id="res_partner_kanban_view" model="ir.ui.view">
+            <field name="name">res.partner.kanban.inherit</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.res_partner_kanban_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//div[@class='oe_kanban_partner_categories']" position="inside">
+                    <t t-foreach="record.category_id.raw_value" t-as="category">
+                        <span class="oe_tag" t-att-data-category_id="category"/>
+                    </t>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/base_setup/static/src/css/base_setup.css b/addons/base_setup/static/src/css/base_setup.css
new file mode 100644
index 00000000000..4e4b8a3c00a
--- /dev/null
+++ b/addons/base_setup/static/src/css/base_setup.css
@@ -0,0 +1,24 @@
+/* Remove bold from labels in config wizards */
+.oe_form_configuration .oe_form_group td:last-child .oe_form_label_help,
+.oe_form_configuration .oe_form_group td:last-child .oe_form_label {
+    font-weight: normal;
+}
+
+/* Separate .eo_link elements from the rest of the label's text */
+.oe_form_configuration .oe_form_group td:last-child .oe_link,
+.oe_form_configuration .oe_form_group td:last-child .oe_separate-from-text {
+    position: relative;
+    left: 2em;
+}
+.oe_form_configuration .oe_form_group td:last-child .oe_link:before,
+.oe_form_configuration .oe_form_group td:last-child .oe_separate-from-text:before {
+    content:"—";
+    padding-right: 1em;
+    color: grey;
+
+    /* Prevent the pseudo element's content to behave like its parent element */
+    position: absolute;
+    right: 100%;
+    bottom: 0; /* Parent element's height can vary */
+    pointer-events: none;
+}
diff --git a/addons/base_setup/static/src/js/base_setup.js b/addons/base_setup/static/src/js/base_setup.js
new file mode 100644
index 00000000000..4f900a3d69b
--- /dev/null
+++ b/addons/base_setup/static/src/js/base_setup.js
@@ -0,0 +1,24 @@
+openerp.base_setup = function(openerp) {
+    /* extend kanban to include the names of partner categories in the kanban view of partners */
+    openerp.web_kanban.KanbanView.include({
+        on_groups_started: function() {
+            var self = this;
+            self._super.apply(this, arguments);
+            if (this.dataset.model === 'res.partner') {
+                /* Set names for partner categories */
+                var category_ids = [];
+                this.$element.find('.oe_kanban_partner_categories span').each(function() {
+                    category_ids.push($(this).data('category_id'));
+                });
+                var dataset = new openerp.web.DataSetSearch(this, 'res.partner.category', self.session.context);
+                dataset.name_get(_.uniq(category_ids)).then(function(result) {
+                    _.each(result, function(value) {
+                        self.$element
+                            .find('.oe_kanban_partner_categories span[data-category_id=' + value[0] + ']')
+                            .html(value[1]);
+                    });
+                });
+            }
+        }
+    });
+};