From 9c2ae8cfc4644e21152ca057f381d27cc1475df5 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 29 Jun 2012 18:13:40 +0530
Subject: [PATCH] [IMP]sale: Improve sale configuration view in two columns

bzr revid: dbr@tinyerp.com-20120629124340-opbailmt015ociwh
---
 addons/base_setup/res_config_view.xml |  8 +++++---
 addons/crm/res_config_view.xml        | 19 ++++++++++---------
 addons/sale/res_config_view.xml       |  9 +++++----
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 93523f06746..d48fc78d9b5 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -61,9 +61,11 @@
                     <sheet>
                         <field name="module_crm" invisible="1"/>
                         <group name="config_sale"/>
-                        <group name="config_fetchmail" string="Emails" attrs="{'invisible': [('module_crm','=',False)]}">
-                            <field name="module_plugin_thunderbird"/>
-                            <field name="module_plugin_outlook"/>
+                        <group name="config_fetchmail_main">
+                            <group name="config_fetchmail" string="Emails" attrs="{'invisible': [('module_crm','=',False)]}">
+                                <field name="module_plugin_thunderbird"/>
+                                <field name="module_plugin_outlook"/>
+                            </group>
                         </group>
                         <group name="config_crm"/>
                     </sheet>
diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index 38c8c2db2e4..5781e631e50 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -16,20 +16,21 @@
                             attrs="{'invisible': [('fetchmail_lead','=',False)]}"/>
                     </div>
                 </group>
-
-                <group name="config_crm" position="after">
+                <group name="config_fetchmail_main" version="7.0" position="inside">
                     <group string="Import and Synchronize Data from an Other Application">
                         <field name="module_import_sugarcrm"/>
                         <field name="module_crm_caldav"/>
                         <field name="module_import_google"/>
                     </group>
-
-                    <group string="Documents and Wiki">
-                        <field name="module_wiki_sale_faq"/>
-                    </group>
-
-                    <group string="Customer Form">
-                        <field name="module_google_map"/>
+                </group>
+                <group name="config_crm" position="inside">
+                    <group>
+                        <group string="Documents and Wiki">
+                            <field name="module_wiki_sale_faq"/>
+                        </group>
+                        <group string="Customer Form">
+                            <field name="module_google_map"/>
+                        </group>
                     </group>
                 </group>
             </field>
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index 2078c141b69..6b737c0d632 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">
-                <group name="config_sale" position="after">
+                <group name="config_sale" position="inside">
                     <field name="module_project_timesheet" invisible="1"/>
                     <field name="module_project_mrp" invisible="1"/>
                     <group string="Invoicing Policy">
@@ -25,7 +25,7 @@
                                 attrs="{'invisible': [('task_work','=',False), ('module_account_analytic_analysis','=',False)],'required': ['|', ('task_work','=',True), ('module_account_analytic_analysis','=',True)]}"/>
                         </group>
                     </group>
-
+                    <newline/>
                     <group string="Sale Order">
                         <group>
                             <field name="group_uom"/>
@@ -42,8 +42,9 @@
                             <field name="module_sale_journal"/>
                         </group>
                     </group>
-
-                    <group string="Contracts">
+                </group>
+                <group name="config_fetchmail_main" position="after">
+                    <group name="group_contacts" string="Contracts">
                         <field name="module_account_analytic_analysis" on_change="onchange_timesheet(module_account_analytic_analysis)"/>
                         <field name="module_analytic_user_function" attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}"/>
                     </group>