From 4a63b52909f5901f5ab29ead4b0f2535d45ed376 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Tue, 24 Jul 2012 15:01:32 +0530
Subject: [PATCH 1/2] [IMP] improve planning & Share Repositories(FTP) labels
 in project and knowledge

bzr revid: fka@tinyerp.com-20120724093132-slplw6bj7twx2g9c
---
 addons/knowledge/res_config.py     | 2 +-
 addons/project/res_config_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/knowledge/res_config.py b/addons/knowledge/res_config.py
index 3f9c5b840f7..ba7e1448831 100644
--- a/addons/knowledge/res_config.py
+++ b/addons/knowledge/res_config.py
@@ -33,7 +33,7 @@ class knowledge_config_settings(osv.osv_memory):
             help="""This is a complete document management system, with: user authentication,
                 full document search (but pptx and docx are not supported), and a document dashboard.
                 This installs the module document."""),
-        'module_document_ftp': fields.boolean('Share repositories (FTP)',
+        'module_document_ftp': fields.boolean('Share Repositories (FTP)',
             help="""Access your documents in OpenERP through an FTP interface.
                 This installs the module document_ftp."""),
         'module_document_webdav': fields.boolean('Share Repositories (WebDAV)',
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index 5e24ecc4d99..4c6ebe85b15 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -12,7 +12,7 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <separator string="Project and Planing"/>
+                    <separator string="Project and Planning"/>
                     <group>
                         <label for="id" string="Project"/>
                         <div>

From 66f6d78432cca0556f4de94224908859841b99d5 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Tue, 24 Jul 2012 18:56:52 +0530
Subject: [PATCH 2/2] [IMP] improve Sales Configuration in sale config wizard

bzr revid: fka@tinyerp.com-20120724132652-k0p3psesr0lvrkmw
---
 addons/base_setup/res_config_view.xml | 13 ++++-
 addons/crm/res_config_view.xml        | 18 +++----
 addons/project/res_config_view.xml    |  2 +-
 addons/sale/res_config_view.xml       | 77 +++++++++++++--------------
 4 files changed, 57 insertions(+), 53 deletions(-)

diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index d37676d00ba..7d9f2cec01e 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -72,11 +72,22 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
+                    <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)]}"/>
                         <div style="color:grey" attrs="{'invisible': [('module_crm','=',False)]}">
-                            The email integration allows ypu to autometically create leads or others documents from an incoming emails account.
+                            The email integration allows you to autometically create leads or others documents from an incoming emails account.
                             Users can do it from the mail client by pressing a button or it can be configured to automatically synchronize from your mail server.
                         </div>
                         <group name="On Mail Client" attrs="{'invisible': [('module_crm','=',False)]}">
diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index b0a46f08ec7..c077d71772d 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -45,21 +45,17 @@
                             </div>
                         </div>
                     </group>
-                    <separator string="Customer Form"/>
+                </div>
+                <div name="Customer Features" position="inside">
                     <div>
-                        <div>
-                            <field name="module_google_map" class="oe_inline"/>
-                            <label for="module_google_map"/>
-                        </div>
+                        <field name="module_google_map" class="oe_inline"/>
+                        <label for="module_google_map"/>
                     </div>
                 </div>
-                <div name="config_sale" position="inside">
-                    <separator string="Documents and Wiki"/>
+                <div name="Sale Features" position="inside">
                     <div>
-                        <div>
-                            <field name="module_wiki_sale_faq"/>
-                            <label for="module_wiki_sale_faq"/>
-                        </div>
+                        <field name="module_wiki_sale_faq"/>
+                        <label for="module_wiki_sale_faq"/>
                     </div>
                 </div>
             </field>
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index 4c6ebe85b15..2b9d38b42d7 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -47,7 +47,7 @@
                         </div>
                     </group>
                     <group>    
-                        <label for="id" string="Planing"/>
+                        <label for="id" string="Planning"/>
                         <div>
                             <div>
                                 <field name="module_project_long_term" class="oe_inline"/>
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index 838286cb971..65e9cee5742 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -8,7 +8,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
-                <div name="config_sale" position="before">
+                <div name="customer feature" position="before">
                     <separator string="Invoicing Process"/>
                     <group>
                         <label for="id" string="Invoicing Process"/>
@@ -50,28 +50,26 @@
                     </group>
                     <field name="module_project_timesheet" invisible="1"/>
                     <field name="module_project_mrp" invisible="1"/>
-                    <separator string="Quotations and Sales Orders"/>
-                    <group>
-                        <label for="id" string="Customer Features"/>
-                        <div>
-                            <div>
-                                <field name="group_sale_delivery_address" class="oe_inline"/>
-                                <label for="group_sale_delivery_address"/>
-                            </div>
-                            <div>
-                                <field name="group_sale_pricelist" class="oe_inline"/>
-                                <label for="group_sale_pricelist"/>
-                            </div>
-                            <div>
-                                <field name="module_sale_journal" class="oe_inline"/>
-                                <label for="module_sale_journal"/>
-                            </div>
-                            <div name="module_warning">
-                                <field name="module_warning" class="oe_inline"/>
-                                <label for="module_warning"/>
-                            </div>
-                        </div>
-                    </group>
+                </div>
+                <div name="Customer Features" position="inside">
+                    <div>
+                        <field name="group_sale_delivery_address" class="oe_inline"/>
+                        <label for="group_sale_delivery_address"/>
+                    </div>
+                    <div>
+                        <field name="group_sale_pricelist" class="oe_inline"/>
+                        <label for="group_sale_pricelist"/>
+                    </div>
+                    <div>
+                        <field name="module_sale_journal" class="oe_inline"/>
+                        <label for="module_sale_journal"/>
+                    </div>
+                    <div name="module_warning">
+                        <field name="module_warning" class="oe_inline"/>
+                        <label for="module_warning"/>
+                    </div>
+                </div>
+                <group name="Sale" position="before">
                     <group>
                         <label for="id" string="Product Features"/>
                         <div>
@@ -89,23 +87,22 @@
                             </div>
                         </div>
                     </group>
-                    <group>
-                        <label for="id" string="Sale Features"/>
-                        <div>
-                            <div>
-                                <field name="group_multiple_shops" class="oe_inline"/>
-                                <label for="group_multiple_shops"/>
-                            </div>
-                            <div attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}">
-                                <field name="default_picking_policy" class="oe_inline"/>
-                                <label for="default_picking_policy"/>
-                            </div>
-                            <div name="module_sale_margin">
-                                <field name="module_sale_margin" class="oe_inline"/>
-                                <label for="module_sale_margin"/>
-                            </div>
-                        </div>
-                    </group>
+                </group>
+                <div name="Sale Features" position="inside">
+                    <div>
+                        <field name="group_multiple_shops" class="oe_inline"/>
+                        <label for="group_multiple_shops"/>
+                    </div>
+                    <div attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}">
+                        <field name="default_picking_policy" class="oe_inline"/>
+                        <label for="default_picking_policy"/>
+                    </div>
+                    <div name="module_sale_margin">
+                        <field name="module_sale_margin" class="oe_inline"/>
+                        <label for="module_sale_margin"/>
+                    </div>
+                </div>
+                <div name="customer feature" position="after">
                     <separator string="Contracts Management"/>
                     <div style="color:grey">
                         Use contract to be able to manage your services with multiple invoicing as part of the same contract with your customer