From 8dff97af65aa43db58d5a65f1497b4f0285a64b9 Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Thu, 28 Jun 2012 15:23:00 +0530
Subject: [PATCH 01/40] [IMP]Entreprise Process process Nodes :form view are
 improved

bzr revid: hsa@tinyerp.com-20120628095300-yr0uxr4s3n6qfvfi
---
 addons/process/process_view.xml | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index fe88f61bd98..aecb784dda7 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -30,13 +30,17 @@
                                     <field name="flow_start"/>
                                 </tree>
                                 <form string="Process Node" version="7.0">
-                                    <group colspan="4" col="4">
-                                        <field name="name"/>
-                                        <field name="flow_start"/>
-                                        <field name="kind"/>
-                                        <field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
-    
+                                    <group>
+                                        <group>
+                                            <field name="name"/>
+                                            <field name="flow_start"/>
+                                        </group>
+                                        <group>
+                                            <field name="kind"/>
+                                            <field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
+                                        </group>
                                     </group>
+                                    
                                     <notebook colspan="4">
                                         <page string="Properties">
                                             <group colspan="4" col="6">
@@ -157,12 +161,16 @@
         <field name="arch" type="xml">
             <form string="Process Node" version="7.0">
                 <sheet layout="auto">
-                    <group colspan="4" col="6">
-                        <field name="name"/>
-                        <field name="process_id"/>
-                        <field name="flow_start"/>
-                        <field name="kind"/>
-                        <field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="process_id"/>
+                            <field name="flow_start"/>
+                        </group>
+                        <group>
+                            <field name="kind"/>
+                            <field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
+                        </group>
                     </group>
                     <notebook>
                         <page string="Properties">

From d6bb214cba33eb984fc6471c1d75da022093a0cc Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Thu, 28 Jun 2012 17:51:51 +0530
Subject: [PATCH 02/40] [IMP]Module Creation : record button on the top left in
 form view

bzr revid: hsa@tinyerp.com-20120628122151-yx9v6dtf61amexeg
---
 .../base_module_record/wizard/base_module_record_data_view.xml | 3 ++-
 .../wizard/base_module_record_object_view.xml                  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/base_module_record/wizard/base_module_record_data_view.xml b/addons/base_module_record/wizard/base_module_record_data_view.xml
index 94e20d98f8b..5f73e5eb3ba 100644
--- a/addons/base_module_record/wizard/base_module_record_data_view.xml
+++ b/addons/base_module_record/wizard/base_module_record_data_view.xml
@@ -8,6 +8,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Data Recording">
+                    <button name="record_objects" icon="gtk-ok" string="Record" type="object"/>
+                    <newline/>
                     <field name="check_date"/>
                     <newline/>
                     <field name="filter_cond"/>
@@ -17,7 +19,6 @@
                     <separator colspan="4"/>
                     <group colspan="4" col="2">
                         <button icon="gtk-cancel" string="Cancel" special="cancel"/>
-                        <button name="record_objects" icon="gtk-ok" string="Record" type="object"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/base_module_record/wizard/base_module_record_object_view.xml b/addons/base_module_record/wizard/base_module_record_object_view.xml
index 60aeba46ef2..f40bf5247af 100644
--- a/addons/base_module_record/wizard/base_module_record_object_view.xml
+++ b/addons/base_module_record/wizard/base_module_record_object_view.xml
@@ -8,6 +8,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Objects Recording">
+                    <button name="record_objects" icon="gtk-ok" string="Record" type="object"/>
+                    <newline/>
                     <field name="check_date"/>
                     <newline/>
                     <field name="filter_cond"/>
@@ -17,7 +19,6 @@
                     <separator colspan="4"/>
                     <group colspan="4" col="2">
                         <button icon="gtk-cancel" string="Cancel" special="cancel"/>
-                        <button name="record_objects" icon="gtk-ok" string="Record" type="object"/>
                     </group>
                 </form>
             </field>

From 9b23f5cc8d7b3a340c53f2fd2cd479b07c61cc2a Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Fri, 29 Jun 2012 11:46:27 +0530
Subject: [PATCH 03/40] [IMP]Module Creation : button put top of theview

bzr revid: hsa@tinyerp.com-20120629061627-j1ty6y7cn41kgfra
---
 .../wizard/base_module_record_data_view.xml                | 7 ++++---
 .../wizard/base_module_record_object_view.xml              | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/addons/base_module_record/wizard/base_module_record_data_view.xml b/addons/base_module_record/wizard/base_module_record_data_view.xml
index 5f73e5eb3ba..182b514cf89 100644
--- a/addons/base_module_record/wizard/base_module_record_data_view.xml
+++ b/addons/base_module_record/wizard/base_module_record_data_view.xml
@@ -7,9 +7,10 @@
             <field name="model">base.module.data</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Data Recording">
-                    <button name="record_objects" icon="gtk-ok" string="Record" type="object"/>
-                    <newline/>
+                <form string="Data Recording" version="7.0">
+                    <header>
+                        <button name="record_objects" icon="gtk-ok" string="Record" type="object"/>
+                    </header>
                     <field name="check_date"/>
                     <newline/>
                     <field name="filter_cond"/>
diff --git a/addons/base_module_record/wizard/base_module_record_object_view.xml b/addons/base_module_record/wizard/base_module_record_object_view.xml
index f40bf5247af..89de0bb67f9 100644
--- a/addons/base_module_record/wizard/base_module_record_object_view.xml
+++ b/addons/base_module_record/wizard/base_module_record_object_view.xml
@@ -7,9 +7,10 @@
             <field name="model">base.module.record</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Objects Recording">
-                    <button name="record_objects" icon="gtk-ok" string="Record" type="object"/>
-                    <newline/>
+                <form string="Objects Recording" version="7.0">
+                    <header>
+                        <button name="record_objects" icon="gtk-ok" string="Record" type="object"/>
+                    </header>
                     <field name="check_date"/>
                     <newline/>
                     <field name="filter_cond"/>

From b90b1d480426e1cac2f6ddd2edc48dd05164c124 Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Fri, 29 Jun 2012 12:03:53 +0530
Subject: [PATCH 04/40] [IMP]Module Creation : Form view improved

bzr revid: hsa@tinyerp.com-20120629063353-d5iar4akcd1lo6sv
---
 .../wizard/base_module_record_data_view.xml   | 21 ++++++++++---------
 .../wizard/base_module_record_object_view.xml | 21 ++++++++++---------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/addons/base_module_record/wizard/base_module_record_data_view.xml b/addons/base_module_record/wizard/base_module_record_data_view.xml
index 182b514cf89..59028e0d89a 100644
--- a/addons/base_module_record/wizard/base_module_record_data_view.xml
+++ b/addons/base_module_record/wizard/base_module_record_data_view.xml
@@ -9,18 +9,19 @@
             <field name="arch" type="xml">
                 <form string="Data Recording" version="7.0">
                     <header>
+                        <button icon="gtk-cancel" string="Cancel" special="cancel"/>
                         <button name="record_objects" icon="gtk-ok" string="Record" type="object"/>
                     </header>
-                    <field name="check_date"/>
-                    <newline/>
-                    <field name="filter_cond"/>
-                    <separator string="Choose objects to record" colspan="4"/>
-                    <field name="objects" colspan="4" nolabel="1"/>
-                    <group><field name="info_yaml"/></group>
-                    <separator colspan="4"/>
-                    <group colspan="4" col="2">
-                        <button icon="gtk-cancel" string="Cancel" special="cancel"/>
-                    </group>
+                    <sheet>
+                        <group>
+                            <field name="check_date" colspan="4"/>
+                            <field name="filter_cond" colspan="4"/>
+                        </group>
+                        <group string="Choose objects to record">
+                            <field name="objects" nolabel="1" colspan="4"/>
+                        </group>
+                        <group><field name="info_yaml"/></group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/base_module_record/wizard/base_module_record_object_view.xml b/addons/base_module_record/wizard/base_module_record_object_view.xml
index 89de0bb67f9..12c930e1fb4 100644
--- a/addons/base_module_record/wizard/base_module_record_object_view.xml
+++ b/addons/base_module_record/wizard/base_module_record_object_view.xml
@@ -9,18 +9,19 @@
             <field name="arch" type="xml">
                 <form string="Objects Recording" version="7.0">
                     <header>
+                        <button icon="gtk-cancel" string="Cancel" special="cancel"/>
                         <button name="record_objects" icon="gtk-ok" string="Record" type="object"/>
                     </header>
-                    <field name="check_date"/>
-                    <newline/>
-                    <field name="filter_cond"/>
-                    <separator string="Choose objects to record" colspan="4"/>
-                    <field name="objects" colspan="4" nolabel="1"/>
-                    <group><field name="info_yaml"/></group>
-                    <separator colspan="4"/>
-                    <group colspan="4" col="2">
-                        <button icon="gtk-cancel" string="Cancel" special="cancel"/>
-                    </group>
+                    <sheet>
+                        <group>
+                            <field name="check_date" colspan="4"/>
+                            <field name="filter_cond" colspan="4"/>
+                        </group>
+                        <group string="Choose objects to record">
+                            <field name="objects" nolabel="1" colspan="4"/>
+                        </group>
+                        <group><field name="info_yaml"/></group>
+                    </sheet>
                 </form>
             </field>
         </record>

From e43c62e302294b7dac9fa2f3bb09d09e1cb2be08 Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Fri, 29 Jun 2012 12:14:44 +0530
Subject: [PATCH 05/40] [IMP]Module Creation : Form view improved

bzr revid: hsa@tinyerp.com-20120629064444-c0uf6ng42erx83gg
---
 .../wizard/base_module_record_data_view.xml                 | 6 +++---
 .../wizard/base_module_record_object_view.xml               | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/base_module_record/wizard/base_module_record_data_view.xml b/addons/base_module_record/wizard/base_module_record_data_view.xml
index 59028e0d89a..0ab03be3526 100644
--- a/addons/base_module_record/wizard/base_module_record_data_view.xml
+++ b/addons/base_module_record/wizard/base_module_record_data_view.xml
@@ -14,11 +14,11 @@
                     </header>
                     <sheet>
                         <group>
-                            <field name="check_date" colspan="4"/>
-                            <field name="filter_cond" colspan="4"/>
+                            <field name="check_date"/>
+                            <field name="filter_cond"/>
                         </group>
                         <group string="Choose objects to record">
-                            <field name="objects" nolabel="1" colspan="4"/>
+                            <field name="objects" nolabel="1"/>
                         </group>
                         <group><field name="info_yaml"/></group>
                     </sheet>
diff --git a/addons/base_module_record/wizard/base_module_record_object_view.xml b/addons/base_module_record/wizard/base_module_record_object_view.xml
index 12c930e1fb4..4b8541ecb15 100644
--- a/addons/base_module_record/wizard/base_module_record_object_view.xml
+++ b/addons/base_module_record/wizard/base_module_record_object_view.xml
@@ -14,11 +14,11 @@
                     </header>
                     <sheet>
                         <group>
-                            <field name="check_date" colspan="4"/>
-                            <field name="filter_cond" colspan="4"/>
+                            <field name="check_date"/>
+                            <field name="filter_cond"/>
                         </group>
                         <group string="Choose objects to record">
-                            <field name="objects" nolabel="1" colspan="4"/>
+                            <field name="objects" nolabel="1"/>
                         </group>
                         <group><field name="info_yaml"/></group>
                     </sheet>

From 34636c3d4b27f7ba4923a3895f5d7aa5565ce256 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Fri, 29 Jun 2012 14:34:24 +0530
Subject: [PATCH 06/40] [IMP]account : Improve company view

bzr revid: dbr@tinyerp.com-20120629090424-7bfqkn64gjcslbe4
---
 addons/account/company_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/company_view.xml b/addons/account/company_view.xml
index b8c595f3ca0..6d624ad1729 100644
--- a/addons/account/company_view.xml
+++ b/addons/account/company_view.xml
@@ -23,8 +23,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="currency_id" position="after">
-                      <field name="property_reserve_and_surplus_account" colspan="2"/>
                       <field name="paypal_account"  placeholder="sales@openerp.com"/>
+                      <field name="property_reserve_and_surplus_account" colspan="2"/>
                 </field>
             </field>
         </record>

From c210f2d679ac84029f42d1cf0e0a0eeb3e4a93ed Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Fri, 29 Jun 2012 16:15:05 +0530
Subject: [PATCH 07/40] [IMP]Configuration Warehouse: view is improved

bzr revid: hsa@tinyerp.com-20120629104505-8abiuw9wo224toqk
---
 addons/stock/res_config_view.xml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index 2f3a4214af8..990d714dc28 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -13,11 +13,16 @@
                         <button string="Cancel" type="object" name="cancel"/>
                     </header>
                     <sheet>
-                        <group string="Traceability">
-                            <field name="group_stock_production_lot"/>
-                            <field name="group_stock_tracking_lot"/>
-                            <field name="module_product_expiry"
-                                attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
+                        <group>
+                            <group string="Traceability">
+                                <field name="group_stock_production_lot"/>
+                                <field name="group_stock_tracking_lot"/>
+                                <field name="module_product_expiry"
+                                    attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
+                            </group>
+                            <group string="Partners">
+                                <field name="module_claim_from_delivery"/>
+                            </group>
                         </group>
                         <group string="Logistics">
                             <group>
@@ -40,9 +45,6 @@
                                 <field name="group_product_variant"/>
                             </group>
                         </group>
-                        <group string="Partners">
-                            <field name="module_claim_from_delivery"/>
-                        </group>
                     </sheet>
                 </form>
             </field>

From 9625c1727ddf4894582518e591e2b0b22b31d197 Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Fri, 29 Jun 2012 16:23:40 +0530
Subject: [PATCH 08/40] [IMP]Configuration Project:view are improved

bzr revid: hsa@tinyerp.com-20120629105340-ucica633w37co8yh
---
 addons/project/res_config_view.xml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index 28258c483ce..ef892239003 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -25,12 +25,14 @@
                                 <field name="time_unit" domain="[('category_id.name','=','Working Time')]"/>
                             </group>
                         </group>
-                        <group string="Planning">
-                            <field name="module_project_long_term"/>
-                        </group>
-                        <group string="Helpdesk and Support" name="support">
-                            <field name="module_project_issue"/>
-                            <field name="module_project_issue_sheet"/>
+                        <group>
+                            <group string="Planning">
+                                <field name="module_project_long_term"/>
+                            </group>
+                            <group string="Helpdesk and Support" name="support">
+                                <field name="module_project_issue"/>
+                                <field name="module_project_issue_sheet"/>
+                            </group>
                         </group>
                     </sheet>
                 </form>

From 27ed0963bf1ed646fc292e1e8563c9c095b17188 Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Fri, 29 Jun 2012 16:49:07 +0530
Subject: [PATCH 09/40] [IMP]Configuration Manufacturing:view are improved

bzr revid: hsa@tinyerp.com-20120629111907-grckz8q46sr0wr2s
---
 addons/mrp/res_config_view.xml | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index da1243452b1..aeb648e455c 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -12,22 +12,26 @@
                         <button string="Cancel" type="object" name="cancel"/>
                     </header>
                     <sheet>
-                        <group string="Manufacturing Order">
-                            <field name="module_mrp_operations"/>
-                            <field name="module_stock_planning"/>
-                            <field name="module_mrp_subproduct"/>
-                            <field name="module_mrp_repair"/>
+                        <group>
+                            <group string="Manufacturing Order">
+                                <field name="module_mrp_operations"/>
+                                <field name="module_stock_planning"/>
+                                <field name="module_mrp_subproduct"/>
+                                <field name="module_mrp_repair"/>
+                            </group>
+                            <group string="Products">
+                                <field name="module_product_manufacturer"/>
+                            </group>
                         </group>
-                        <group string="Logistics">
-                            <field name="module_mrp_jit"/>
-                            <field name="module_stock_no_autopicking"/>
-                        </group>
-                        <group string="Bill Of Material">
-                            <field name="group_mrp_routings"/>
-                            <field name="group_mrp_properties"/>
-                        </group>
-                        <group string="Products">
-                            <field name="module_product_manufacturer"/>
+                        <group>
+                            <group string="Logistics">
+                                <field name="module_mrp_jit"/>
+                                <field name="module_stock_no_autopicking"/>
+                            </group>
+                            <group string="Bill Of Material">
+                                <field name="group_mrp_routings"/>
+                                <field name="group_mrp_properties"/>
+                            </group>
                         </group>
                     </sheet>
                 </form>

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 10/40] [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>

From facae8fb8812793c9b7b868f5ce018b87657ba39 Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Fri, 29 Jun 2012 18:47:58 +0530
Subject: [PATCH 11/40] [IMP]Configuration Purchase: invoicing view improved

bzr revid: hsa@tinyerp.com-20120629131758-3ov31tzsk16szgat
---
 addons/purchase/res_config_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 1afd2d04a90..3fa8e5601eb 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -13,8 +13,8 @@
                     </header>
                     <sheet>
                         <group string="Invoicing">
-                            <field name="default_invoice_method"/>
-                            <field name="decimal_precision"/>
+                            <field name="default_invoice_method" class="oe_inline"/>
+                            <field name="decimal_precision" class="oe_inline"/>
                         </group>
                         <group string="Purchase Order">
                             <group>

From c9f47fb555e42f0b2c5819f3c2d441d072548d07 Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Mon, 2 Jul 2012 17:08:33 +0530
Subject: [PATCH 12/40] [IMP]Configuration General Settings : view improved

bzr revid: hsa@tinyerp.com-20120702113833-hndkd60fq5atniui
---
 addons/base_setup/res_config_view.xml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 47d90f0399a..161cb29b173 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -25,14 +25,16 @@
                                 <button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute"/>
                             </group>
                         </group>
-                        <group string="External Accesses">
-                            <field name="module_share"/>
-                            <field name="module_portal"/>
-                        </group>
-                        <group string="Others">
-                            <label for="id" string="Outgoing Mail Servers"/>
-                            <button type="action" name="%(base.action_ir_mail_server_list)d"
+                        <group>
+                            <group string="External Accesses">
+                                <field name="module_share"/>
+                                <field name="module_portal"/>
+                            </group>
+                            <group string="Others">
+                                <label for="id" string="Outgoing Mail Servers"/>
+                                <button type="action" name="%(base.action_ir_mail_server_list)d"
                                 string="Configure" icon="gtk-execute"/>
+                            </group>
                         </group>
                     </sheet>
                 </form>

From 161a91ed77c1770ea25d7a6a7cac039910a05d5f Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Mon, 2 Jul 2012 17:56:22 +0530
Subject: [PATCH 13/40] [IMP]Configuration Warehouse : view improved

bzr revid: hsa@tinyerp.com-20120702122622-kk5oi380sdjj942t
---
 addons/stock/res_config_view.xml | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index 383c2774b56..f5c151056f4 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -25,24 +25,18 @@
                                 <field name="module_claim_from_delivery"/>
                             </group>
                         </group>
-                        <group string="Logistics">
-                            <group>
+                        <group>
+                            <group string="Logistics">
                                 <field name="group_stock_multiple_locations"/>
                                 <field name="module_stock_invoice_directly"/>
-                            </group>
-                            <group>
                                 <field name="module_stock_location"/>
-                                <field name="decimal_precision"/>
+                                <field name="decimal_precision" class="oe_inline"/>
                             </group>
-                        </group>
-                        <group string="Products">
-                            <group>
+                            <group string="Products">
                                 <field name="group_stock_packaging"/>
                                 <field name="group_uom"/>
                                 <field name="group_uos"/>
-                            </group>
-                            <group>
-                                <field name="group_stock_inventory_valuation"/>
+                                <field name="group_stock_inventory_valuation" class="oe_inline"/>
                                 <field name="group_product_variant"/>
                             </group>
                         </group>

From 0fd2ca6bdca5ce292ac5de1364b1e0bb9b01bd6a Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Tue, 3 Jul 2012 10:45:46 +0530
Subject: [PATCH 14/40] [IMP]Improve company view in settings and organise in
 group

bzr revid: sgo@tinyerp.com-20120703051546-2bxwnl0evv8qzirz
---
 addons/account_check_writing/account_view.xml        | 10 +++++-----
 .../hr_timesheet_sheet/hr_timesheet_sheet_view.xml   | 12 ++++++------
 addons/l10n_ch/company_view.xml                      |  6 ++----
 addons/mrp/company_view.xml                          |  6 ++----
 addons/pad/res_company.xml                           |  7 ++++---
 addons/procurement/company_view.xml                  |  9 +++++----
 addons/project/project_view.xml                      |  4 ++--
 addons/purchase/company_view.xml                     |  6 ++----
 addons/sale/company_view.xml                         |  6 +++---
 addons/users_ldap/users_ldap_view.xml                |  2 +-
 10 files changed, 32 insertions(+), 36 deletions(-)

diff --git a/addons/account_check_writing/account_view.xml b/addons/account_check_writing/account_view.xml
index 2b065a2afee..13b3b820226 100644
--- a/addons/account_check_writing/account_view.xml
+++ b/addons/account_check_writing/account_view.xml
@@ -31,11 +31,11 @@
             <field name="priority">17</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <page string="Configuration" position="inside">
-                    <separator string="Default Check Layout" colspan="4"/>
-                    <field name="check_layout"/>
-                    <newline/>
-                </page>
+                <xpath expr="//group[@name='currency']" position="after">
+                    <group string="Default Check Layout">
+                        <field name="check_layout"/>
+                    </group>
+                </xpath>
             </field>
        </record>
     </data>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index c43b1206541..f05c1b7f9be 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -196,12 +196,12 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <page string="Configuration" position="inside">
-                    <separator string="Timesheets" colspan="4"/>
-                    <field name="timesheet_range"/>
-                    <field name="timesheet_max_difference"/>
-                    <newline/>
-                </page>
+                <xpath expr="//group[@name='currency']" position="after">
+                    <group string="Timesheets">
+                        <field name="timesheet_range"/>
+                        <field name="timesheet_max_difference"/>
+                    </group>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/l10n_ch/company_view.xml b/addons/l10n_ch/company_view.xml
index 0d107f63723..1897c894462 100644
--- a/addons/l10n_ch/company_view.xml
+++ b/addons/l10n_ch/company_view.xml
@@ -7,8 +7,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <field name="rml_footer2" position="after">
-                <newline/>
+                <xpath expr="//div[@name='bank_acc']" position="after">
                     <group string="BVR data" colspan="4">
                         <field name="bvr_delta_horz"/>
                         <field name="bvr_delta_vert"/>
@@ -20,8 +19,7 @@
                         <field name="bvr_only"/>
                         <field name="invoice_only"/>
                     </group>
-                <newline/>
-                </field>
+                </xpath>
             </field>
         </record>
     </data>
diff --git a/addons/mrp/company_view.xml b/addons/mrp/company_view.xml
index bb342ccde41..d7e518699e0 100644
--- a/addons/mrp/company_view.xml
+++ b/addons/mrp/company_view.xml
@@ -9,11 +9,9 @@
             <field name="priority">22</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <page string="Configuration" position="inside">
-                    <group>
+                <xpath expr="//field[@name='currency_id']" position="after">
                         <field name="manufacturing_lead"/>
-                    </group>
-                </page>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/pad/res_company.xml b/addons/pad/res_company.xml
index 20b6f52d853..8f65c507c61 100644
--- a/addons/pad/res_company.xml
+++ b/addons/pad/res_company.xml
@@ -6,9 +6,10 @@
       <field name="type">form</field>
       <field name="inherit_id" ref="base.view_company_form"/>
       <field name="arch" type="xml">
-        <xpath expr="//page[@string='Configuration']" position="inside">
-          <separator string="Pad" colspan="4"/>
-          <field name="pad_url_template"/>
+        <xpath expr="//group[@name='currency']" position="after">
+          <group string="Pad">
+            <field name="pad_url_template"/>
+          </group>
         </xpath>
       </field>
     </record>
diff --git a/addons/procurement/company_view.xml b/addons/procurement/company_view.xml
index 4d14f69edde..49e50f8c0f2 100644
--- a/addons/procurement/company_view.xml
+++ b/addons/procurement/company_view.xml
@@ -9,10 +9,11 @@
             <field name="priority">17</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <page string="Configuration" position="inside">
-                    <separator string="MRP &amp; Logistics Scheduler" colspan="4"/>
-                    <field name="schedule_range"/>
-                </page>
+                <xpath expr="//group[@name='currency']" position="after">
+                    <group string="MRP &amp; Logistics Scheduler">
+                        <field name="schedule_range"/>
+                    </group>
+                </xpath>
             </field>
        </record>
     
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index e58aad743dd..6c5ffd998fa 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -739,11 +739,11 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <page string="Configuration" position="inside">
+                <xpath expr="//group[@name='currency']" position="after">
                     <group string="Project Management">
                         <field name="project_time_mode_id" domain="[('category_id','=','Working Time')]"/>
                     </group>
-                </page>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/purchase/company_view.xml b/addons/purchase/company_view.xml
index 08637ba362d..9e935fe34fe 100644
--- a/addons/purchase/company_view.xml
+++ b/addons/purchase/company_view.xml
@@ -9,11 +9,9 @@
             <field name="priority">19</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <page string="Configuration" position="inside">
-                    <group>
+                <xpath expr="//field[@name='currency_id']" position="after">
                         <field name="po_lead"/>
-                    </group>
-                </page>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/sale/company_view.xml b/addons/sale/company_view.xml
index 96ff91e8e90..73f67707ce6 100644
--- a/addons/sale/company_view.xml
+++ b/addons/sale/company_view.xml
@@ -8,9 +8,9 @@
             <field name="priority">24</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <page string="Configuration" position="inside">
-                    <field name="security_lead"/>
-                </page>
+                <xpath expr="//field[@name='currency_id']" position="after">
+                   <field name="security_lead"/>
+                </xpath>
             </field>
         </record>
     </data>
diff --git a/addons/users_ldap/users_ldap_view.xml b/addons/users_ldap/users_ldap_view.xml
index 40d01f43bf3..3664f735836 100644
--- a/addons/users_ldap/users_ldap_view.xml
+++ b/addons/users_ldap/users_ldap_view.xml
@@ -7,7 +7,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//page[@string='Configuration']" position="inside">
+                <xpath expr="//group[@name='currency']" position="after">
                     <field name="ldaps" nolabel="1" colspan="4">
                         <form string="LDAP Configuration" version="7.0">
                             <group col="4">

From 85c66c7757b7e8b4dcd61fd9b9f6394ec224c4e1 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Tue, 3 Jul 2012 14:13:40 +0530
Subject: [PATCH 15/40] [IMP]improve view of default company

bzr revid: sgo@tinyerp.com-20120703084340-sama1zo7tvlhsw0a
---
 addons/multi_company/res_company_view.xml | 27 ++++++++++++-----------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/addons/multi_company/res_company_view.xml b/addons/multi_company/res_company_view.xml
index 1a185fb08f3..e3aa5b1d65f 100644
--- a/addons/multi_company/res_company_view.xml
+++ b/addons/multi_company/res_company_view.xml
@@ -26,17 +26,18 @@
             <field name="priority" eval="8"/>
             <field name="arch" type="xml">
                 <form string="Multi Company">
-                    <group col="6" colspan="4">
-                        <field name="name" colspan="6"/>
-                        <separator string="Matching" colspan="6"/>
-                        <field name="company_id" groups="base.group_multi_company"/>
-                        <field name="object_id"/>
-                        <field name="field_id" domain="[('model_id','=',object_id)]"/>
-                        <separator string="Condition" colspan="6"/>
-                        <field name="expression" colspan="4"/>
-                        <field name="sequence"/>
-                        <separator string="Returning" colspan="6"/>
-                        <field name="company_dest_id"/>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="company_id" groups="base.group_multi_company"/>
+                            <field name="company_dest_id"/>
+                        </group>
+                        <group>
+                            <field name="object_id"/>
+                            <field name="field_id" domain="[('model_id','=',object_id)]"/>
+                            <field name="expression"/>
+                            <field name="sequence"/>
+                        </group>
                     </group>
                 </form>
             </field>
@@ -66,12 +67,12 @@
             <field name="search_view_id" ref="view_inventory_search"/>
         </record>
 
-        <menuitem id="menu_custom_multicompany"
+        <menuitem id="base.menu_custom_multicompany"
             name="Multi-Companies"
             parent="base.menu_custom"
             sequence="50"/>
 
-        <menuitem id="menu_action_inventory_form" 
+        <menuitem id="base.menu_action_inventory_form" 
             action="action_inventory_form"
             parent="menu_custom_multicompany"/>
     </data>

From aeb72c890a95542a5d791afa60b0d6bca29ecb74 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Tue, 3 Jul 2012 14:31:53 +0530
Subject: [PATCH 16/40] [IMP]minor changes

bzr revid: sgo@tinyerp.com-20120703090153-5ci2w6nbxnxtrkta
---
 addons/multi_company/res_company_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/multi_company/res_company_view.xml b/addons/multi_company/res_company_view.xml
index e3aa5b1d65f..169f42d640e 100644
--- a/addons/multi_company/res_company_view.xml
+++ b/addons/multi_company/res_company_view.xml
@@ -67,7 +67,7 @@
             <field name="search_view_id" ref="view_inventory_search"/>
         </record>
 
-        <menuitem id="base.menu_custom_multicompany"
+        <menuitem id="menu_custom_multicompany"
             name="Multi-Companies"
             parent="base.menu_custom"
             sequence="50"/>

From 5751e9efb60ca239b5fa7dfd5ad2f06d4aceff1e Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 4 Jul 2012 16:26:49 +0530
Subject: [PATCH 17/40] [IMP]base_module_record: Set cancel as link

bzr revid: dbr@tinyerp.com-20120704105649-7aepk4ltnpgfr27z
---
 .../wizard/base_module_record_data_view.xml                   | 4 ++--
 .../wizard/base_module_record_object_view.xml                 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/base_module_record/wizard/base_module_record_data_view.xml b/addons/base_module_record/wizard/base_module_record_data_view.xml
index 4302375c7db..9efa33f6ef3 100644
--- a/addons/base_module_record/wizard/base_module_record_data_view.xml
+++ b/addons/base_module_record/wizard/base_module_record_data_view.xml
@@ -9,9 +9,9 @@
             <field name="arch" type="xml">
                 <form string="Data Recording" version="7.0">
                     <header>
-                        <button icon="gtk-cancel" string="Cancel" special="cancel"/>
-                        or
                         <button name="record_objects" icon="gtk-ok" string="Record" type="object"/>
+                        or
+                        <button icon="gtk-cancel" string="Cancel" special="cancel" class="oe_link"/>
                     </header>
                     <sheet>
                         <group>
diff --git a/addons/base_module_record/wizard/base_module_record_object_view.xml b/addons/base_module_record/wizard/base_module_record_object_view.xml
index a504dbc2eb5..b5b5341810f 100644
--- a/addons/base_module_record/wizard/base_module_record_object_view.xml
+++ b/addons/base_module_record/wizard/base_module_record_object_view.xml
@@ -9,9 +9,9 @@
             <field name="arch" type="xml">
                 <form string="Objects Recording" version="7.0">
                     <header>
-                        <button icon="gtk-cancel" string="Cancel" special="cancel"/>
-                        or
                         <button name="record_objects" icon="gtk-ok" string="Record" type="object"/>
+                        or
+                        <button icon="gtk-cancel" string="Cancel" special="cancel" class="oe_link"/>
                     </header>
                     <sheet>
                         <group>

From 7d1b8912f580e37c92b7d60032712d75453bea51 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 4 Jul 2012 17:16:28 +0530
Subject: [PATCH 18/40] [IMP]documet: Imp string

bzr revid: dbr@tinyerp.com-20120704114628-h7ioskm0jrtyesgn
---
 addons/document/document_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 6fb99d936d4..0f3fd7b563e 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -392,7 +392,7 @@
         <field name="priority" eval="1"/>
         <field name="arch" type="xml">
             <field name="subflow_id" position="after">
-                <field name="directory_id" domain="[('ressource_type_id','=',model_id),('ressource_parent_type_id','=',False)]"/>
+                <field name="directory_id" string="Document Directory" domain="[('ressource_type_id','=',model_id),('ressource_parent_type_id','=',False)]"/>
                 <newline/>
             </field>
         </field>

From 0e2629f02aab235cd65862a805b7b478c9fbebac Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 5 Jul 2012 11:07:14 +0530
Subject: [PATCH 19/40] [IMP]base_module_record:add oe_highlight class where
 needed

bzr revid: sgo@tinyerp.com-20120705053714-ksblf0vm2vtsbvy0
---
 .../base_module_record/wizard/base_module_record_data_view.xml  | 2 +-
 .../wizard/base_module_record_object_view.xml                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base_module_record/wizard/base_module_record_data_view.xml b/addons/base_module_record/wizard/base_module_record_data_view.xml
index 9efa33f6ef3..ecce5cc0f3a 100644
--- a/addons/base_module_record/wizard/base_module_record_data_view.xml
+++ b/addons/base_module_record/wizard/base_module_record_data_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Data Recording" version="7.0">
                     <header>
-                        <button name="record_objects" icon="gtk-ok" string="Record" type="object"/>
+                        <button name="record_objects" icon="gtk-ok" string="Record" type="object" class="oe_highlight"/>
                         or
                         <button icon="gtk-cancel" string="Cancel" special="cancel" class="oe_link"/>
                     </header>
diff --git a/addons/base_module_record/wizard/base_module_record_object_view.xml b/addons/base_module_record/wizard/base_module_record_object_view.xml
index b5b5341810f..66eee2ff3ce 100644
--- a/addons/base_module_record/wizard/base_module_record_object_view.xml
+++ b/addons/base_module_record/wizard/base_module_record_object_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Objects Recording" version="7.0">
                     <header>
-                        <button name="record_objects" icon="gtk-ok" string="Record" type="object"/>
+                        <button name="record_objects" icon="gtk-ok" string="Record" type="object" class="oe_highlight"/>
                         or
                         <button icon="gtk-cancel" string="Cancel" special="cancel" class="oe_link"/>
                     </header>

From 3055e82e4c499db85750bcf1663648fcc8386729 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 5 Jul 2012 14:21:25 +0530
Subject: [PATCH 20/40] [IMP]improve configuaration view for sale and warehouse
 as per review

bzr revid: sgo@tinyerp.com-20120705085125-9gtbt5h3bqmf1tar
---
 addons/base_setup/res_config_view.xml | 15 +++----
 addons/crm/res_config_view.xml        | 29 ++++++-------
 addons/crm_claim/res_config_view.xml  |  4 +-
 addons/sale/res_config_view.xml       | 60 +++++++++++----------------
 addons/stock/res_config_view.xml      | 22 +++++-----
 5 files changed, 56 insertions(+), 74 deletions(-)

diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 161cb29b173..cbab182ecb3 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -63,15 +63,16 @@
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
                     <sheet>
-                        <field name="module_crm" invisible="1"/>
-                        <group name="config_sale"/>
-                        <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 name="config_sale">
+                                <field name="module_crm" invisible="1"/>
+                                <separator string="Emails" colspan="2"/>
+                                <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>
                         </group>
-                        <group name="config_crm"/>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index 7120d26ac65..2bc085ac562 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -8,30 +8,25 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
-                <group name="config_fetchmail" version="7.0" position="inside">
+                <field name="module_plugin_outlook" version="7.0" position="after">
                     <label for="fetchmail_lead"/>
                     <div>
                         <field name="fetchmail_lead"/>
                         <button name="configure_fetchmail_lead" type="object" string="Configure" icon="gtk-go-forward"
                             attrs="{'invisible': [('fetchmail_lead','=',False)]}"/>
                     </div>
+                </field>
+                <group name="config_other" version="7.0" position="inside">
+                    <separator string="Import and Synchronize Data from an Other Application" colspan="2"/>
+                    <field name="module_import_sugarcrm"/>
+                    <field name="module_crm_caldav"/>
+                    <field name="module_import_google"/>
+                    <separator string="Customer Form" colspan="2"/>
+                    <field name="module_google_map"/>
                 </group>
-                <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>
-                <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 name="config_sale" position="inside">
+                    <separator string="Documents and Wiki" colspan="2"/>
+                        <field name="module_wiki_sale_faq"/>
                 </group>
             </field>
         </record>
diff --git a/addons/crm_claim/res_config_view.xml b/addons/crm_claim/res_config_view.xml
index c87f7b001c2..877da7304e8 100644
--- a/addons/crm_claim/res_config_view.xml
+++ b/addons/crm_claim/res_config_view.xml
@@ -9,14 +9,14 @@
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="priority" eval="20"/>       <!-- to put fetchmail_lead before fetchmail_claim -->
             <field name="arch" type="xml">
-                <group name="config_fetchmail" version="7.0" position="inside">
+                <field name="module_plugin_outlook" version="7.0" position="after">
                     <label for="fetchmail_claim"/>
                     <div>
                         <field name="fetchmail_claim"/>
                         <button type="object" name="configure_fetchmail_claim" string="Configure" icon="gtk-go-forward"
                             attrs="{'invisible': [('fetchmail_claim','=',False)]}"/>
                     </div>
-                </group>
+                </field>
             </field>
         </record>
 
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index 6b737c0d632..f81a2818c38 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -11,43 +11,31 @@
                 <group name="config_sale" position="inside">
                     <field name="module_project_timesheet" invisible="1"/>
                     <field name="module_project_mrp" invisible="1"/>
-                    <group string="Invoicing Policy">
-                        <group>
-                            <field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
-                            <field name="group_invoice_deli_orders" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
-                            <field name="task_work" on_change="onchange_task_work(task_work)"/>
-                            <field name="timesheet" on_change="onchange_timesheet(timesheet)"/>
-                        </group>
-                        <group>
-                            <field name="default_order_policy" attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False)],'required': ['|',('group_invoice_so_lines','=',True),('group_invoice_deli_orders','=',True)]}"/>
-                            <field name="module_delivery" attrs="{'invisible':[('group_invoice_so_lines','=',False), ('group_invoice_deli_orders','=',False)]}"/>
-                            <field name="time_unit" domain="[('category_id.name','=','Working Time')]"
-                                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"/>
-                            <field name="group_sale_delivery_address"/>
-                            <field name="group_sale_pricelist"/>
-                            <field name="group_multiple_shops"/>
-                            <field name="module_warning"/>
-                            <field name="decimal_precision"/>
-                        </group>
-                        <group>
-                            <field name="default_picking_policy" attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}"/>
-                            <field name="group_discount_per_so_line"/>
-                            <field name="module_sale_margin"/>
-                            <field name="module_sale_journal"/>
-                        </group>
-                    </group>
+                    <separator string="Sale Order" colspan="2"/>
+                    <field name="group_uom"/>
+                    <field name="group_sale_delivery_address"/>
+                    <field name="group_sale_pricelist"/>
+                    <field name="group_multiple_shops"/>
+                    <field name="module_warning"/>
+                    <field name="decimal_precision"/>
+                    <field name="default_picking_policy" attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}"/>
+                    <field name="group_discount_per_so_line"/>
+                    <field name="module_sale_margin"/>
+                    <field name="module_sale_journal"/>
                 </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>
+                <group name="config_other" position="inside">
+                    <separator string="Invoicing Policy" colspan="2" />
+                    <field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
+                    <field name="group_invoice_deli_orders" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
+                    <field name="task_work" on_change="onchange_task_work(task_work)"/>
+                    <field name="timesheet" on_change="onchange_timesheet(timesheet)"/>
+                    <field name="default_order_policy" attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False)],'required': ['|',('group_invoice_so_lines','=',True),('group_invoice_deli_orders','=',True)]}"/>
+                    <field name="module_delivery" attrs="{'invisible':[('group_invoice_so_lines','=',False), ('group_invoice_deli_orders','=',False)]}"/>
+                    <field name="time_unit" domain="[('category_id.name','=','Working Time')]"
+                        attrs="{'invisible': [('task_work','=',False), ('module_account_analytic_analysis','=',False)],'required': ['|', ('task_work','=',True), ('module_account_analytic_analysis','=',True)]}"/>
+                    <separator string="Contracts" colspan="2"/>
+                    <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>
             </field>
         </record>
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index f5c151056f4..d5e3d6f60c5 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -15,24 +15,22 @@
                     </header>
                     <sheet>
                         <group>
-                            <group string="Traceability">
+                            <group>
+                                <separator string="Traceability" colspan="2"/>
                                 <field name="group_stock_production_lot"/>
                                 <field name="group_stock_tracking_lot"/>
                                 <field name="module_product_expiry"
                                     attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
+                                 <separator string="Logistics" colspan="2"/>
+                                 <field name="group_stock_multiple_locations"/>
+                                 <field name="module_stock_invoice_directly"/>
+                                 <field name="module_stock_location"/>
+                                 <field name="decimal_precision" class="oe_inline"/>
                             </group>
-                            <group string="Partners">
+                            <group>
+                                <separator string="Partners" colspan="2"/>
                                 <field name="module_claim_from_delivery"/>
-                            </group>
-                        </group>
-                        <group>
-                            <group string="Logistics">
-                                <field name="group_stock_multiple_locations"/>
-                                <field name="module_stock_invoice_directly"/>
-                                <field name="module_stock_location"/>
-                                <field name="decimal_precision" class="oe_inline"/>
-                            </group>
-                            <group string="Products">
+                                <separator string="Products" colspan="2"/>
                                 <field name="group_stock_packaging"/>
                                 <field name="group_uom"/>
                                 <field name="group_uos"/>

From c3fc472a46f29da0f93a8f9928d68a36ef306882 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 5 Jul 2012 14:48:01 +0530
Subject: [PATCH 21/40] [IMP]improve configuaration view for hr

bzr revid: sgo@tinyerp.com-20120705091801-kapmj1qkh61cs4yg
---
 addons/hr/res_config_view.xml             | 12 ++++--------
 addons/hr_recruitment/res_config_view.xml | 19 +++++++++----------
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index b41ccd0e935..1916760635d 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -21,13 +21,11 @@
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
                     <sheet>
-                        <group string="Additional Features">
-                            <group>
+                        <group>
+                            <group string="Additional Features" name="left_column">
                                 <field name="module_hr_expense"/>
                                 <field name="module_hr_evaluation"/>
                                 <field name="module_hr_holidays"/>
-                            </group>
-                            <group>
                                 <field name="module_hr_recruitment"/>
                                 <field name="module_hr_contract"/>
                                 <label for="module_hr_payroll"/>
@@ -38,14 +36,12 @@
                                         attrs="{'invisible': [('module_hr_payroll','=',False)]}"/>
                                 </div>
                             </group>
-                        </group>
-                        <group>
-                            <group string="Timesheets">
+                            <group name="right_column">
+                                <separator string="Timesheets" colspan="2"/>
                                 <field name="module_hr_attendance" on_change="onchange_hr_attendance(module_hr_attendance)"/>
                                 <field name="module_hr_timesheet" on_change="onchange_hr_timesheet(module_hr_timesheet)"/>
                                 <field name="module_hr_timesheet_sheet"/>
                             </group>
-                            <group name="config_recruitment"/>
                         </group>
                     </sheet>
                 </form>
diff --git a/addons/hr_recruitment/res_config_view.xml b/addons/hr_recruitment/res_config_view.xml
index 011e3816c2c..60d6d8d152d 100644
--- a/addons/hr_recruitment/res_config_view.xml
+++ b/addons/hr_recruitment/res_config_view.xml
@@ -7,16 +7,15 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
-                <group name="config_recruitment" position="replace">
-                    <group name="config_recruitment" string="Recruitment">
-                        <field name="module_document_ftp"/>
-                        <label for="fetchmail_applicants"/>
-                        <div>
-                            <field name="fetchmail_applicants"/>
-                            <button name="configure_fetchmail_applicants" type="object" string="Configure" icon="gtk-go-forward"
-                                attrs="{'invisible': [('fetchmail_applicants','=',False)]}"/>
-                        </div>
-                    </group>
+                <group name="right_column" position="inside">
+                    <separator string="Recruitment" colspan="2"/>
+                    <field name="module_document_ftp"/>
+                    <label for="fetchmail_applicants"/>
+                    <div>
+                        <field name="fetchmail_applicants"/>
+                        <button name="configure_fetchmail_applicants" type="object" string="Configure" icon="gtk-go-forward"
+                            attrs="{'invisible': [('fetchmail_applicants','=',False)]}"/>
+                    </div>
                 </group>
             </field>
         </record>

From 728305c37ba1c14d1a4d5591a96a0bf6bb3c2ec7 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 5 Jul 2012 15:05:04 +0530
Subject: [PATCH 22/40] [IMP]improve configuaration view for mrp and project

bzr revid: sgo@tinyerp.com-20120705093504-ycuahdiftrurmibj
---
 addons/base_setup/res_config_view.xml    | 11 +++--------
 addons/mrp/res_config_view.xml           | 12 ++++--------
 addons/project/res_config_view.xml       | 13 +++++--------
 addons/project_issue/res_config_view.xml |  4 ++--
 4 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index cbab182ecb3..c64f9fc3c4b 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -13,24 +13,19 @@
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
                     <sheet>
-                        <group string="Company Settings">
-                            <group>
+                        <group>
+                            <group string="Company Settings">
                                 <field name="module_multi_company"/>
-                            </group>
-                            <group>
                                 <div>
                                     You will also find several configuration options on your company data:
                                     address for the header and footer, overdue payments texts, etc.
                                 </div>
                                 <button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute"/>
                             </group>
-                        </group>
-                        <group>
                             <group string="External Accesses">
                                 <field name="module_share"/>
                                 <field name="module_portal"/>
-                            </group>
-                            <group string="Others">
+                                <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"/>
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 921b2cbd981..e81a1d42df4 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -19,17 +19,13 @@
                                 <field name="module_stock_planning"/>
                                 <field name="module_mrp_subproduct"/>
                                 <field name="module_mrp_repair"/>
-                            </group>
-                            <group string="Products">
-                                <field name="module_product_manufacturer"/>
-                            </group>
-                        </group>
-                        <group>
-                            <group string="Logistics">
+                                <separator string="Logistics" colspan="2"/>
                                 <field name="module_mrp_jit"/>
                                 <field name="module_stock_no_autopicking"/>
                             </group>
-                            <group string="Bill Of Material">
+                            <group string="Products">
+                                <field name="module_product_manufacturer"/>
+                                <separator string="Bill Of Material" colspan="2"/>
                                 <field name="group_mrp_routings"/>
                                 <field name="group_mrp_properties"/>
                             </group>
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index 61c26fa678f..6b725207c69 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -13,24 +13,21 @@
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
                     <sheet>
-                        <group string="Project">
+                        <group>
                             <group>
+                                <separator string="Project" colspan="2"/>
                                 <field name="module_project_mrp"/>
                                 <field name="module_project_timesheet"/>
                                 <field name="module_pad"/>
-                            </group>
-                            <group>
                                 <field name="group_tasks_work_on_tasks"/>
                                 <field name="group_time_work_estimation_tasks"/>
                                 <field name="group_manage_delegation_task"/>
                                 <field name="time_unit" domain="[('category_id.name','=','Working Time')]"/>
                             </group>
-                        </group>
-                        <group>
-                            <group string="Planning">
+                            <group name="project_left_column">
+                                <separator string="Project" colspan="2"/>
                                 <field name="module_project_long_term"/>
-                            </group>
-                            <group string="Helpdesk and Support" name="support">
+                                <separator string="Helpdesk and Support" colspan="2"/>
                                 <field name="module_project_issue"/>
                                 <field name="module_project_issue_sheet"/>
                             </group>
diff --git a/addons/project_issue/res_config_view.xml b/addons/project_issue/res_config_view.xml
index 1c9702e3d38..81426e2b8a4 100644
--- a/addons/project_issue/res_config_view.xml
+++ b/addons/project_issue/res_config_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.view_config_settings"/>
             <field name="arch" type="xml">
-                <group name="support" position="inside">
+                <field name="module_project_issue_sheet" position="after">
                     <label for="fetchmail_issue"/>
                     <div>
                         <field name="fetchmail_issue"/>
                         <button name="configure_fetchmail_issue" type="object" string="Configure" icon="gtk-go-forward"
                             attrs="{'invisible': [('fetchmail_issue','=',False)]}"/>
                     </div>
-                </group>
+                </field>
             </field>
         </record>
 

From 20133559029ff2ea570a20cc2b176fb929199849 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 5 Jul 2012 15:15:59 +0530
Subject: [PATCH 23/40] [IMP]improve configuaration view for purchase

bzr revid: sgo@tinyerp.com-20120705094559-7gtbgoioewqpj66e
---
 addons/purchase/res_config_view.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index e1ca0b40d3a..b98eea42ade 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -13,17 +13,17 @@
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
                     <sheet>
-                        <group string="Invoicing">
-                            <field name="default_invoice_method" class="oe_inline"/>
-                            <field name="decimal_precision" class="oe_inline"/>
-                        </group>
-                        <group string="Purchase Order">
+                        <group>
                             <group>
+                                <separator string="Invoicing" colspan="2"/>
+                                <field name="default_invoice_method" class="oe_inline"/>
+                                <field name="decimal_precision" class="oe_inline"/>
+                            </group>
+                            <group>
+                                <separator string="Purchase Order" colspan="2"/>
                                 <field name="group_purchase_pricelist"/>
                                 <field name="group_uom"/>
                                 <field name="group_purchase_delivery_address"/>
-                            </group>
-                            <group>
                                 <field name="module_purchase_double_validation"/>
                                 <field name="module_purchase_requisition"/>
                                 <field name="module_warning"/>

From bc862394572977cbd9b8e8f31d2d910bfba99c43 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 5 Jul 2012 16:43:51 +0530
Subject: [PATCH 24/40] [IMP]improve configuaration view for account

bzr revid: sgo@tinyerp.com-20120705111351-ohdoe9o26zbi9p4d
---
 addons/account/res_config_view.xml  | 54 +++++++++++------------------
 addons/purchase/res_config_view.xml |  9 ++---
 addons/sale/res_config_view.xml     |  9 ++---
 3 files changed, 30 insertions(+), 42 deletions(-)

diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index c6bd026882a..ffb785380aa 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -34,7 +34,6 @@
                         <field name="expects_chart_of_accounts"/>
                     </group>
 
-                    <div class="oe_form_button_save_dirty">
                     <group string="Select a Chart of Accounts to Install"
                         attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}">
                         <group>
@@ -51,9 +50,7 @@
                         <button string="Install More Chart Templates" icon="gtk-go-forward"
                             name="%(open_account_charts_modules)d" type="action"/>
                     </group>
-                    </div>
 
-                    <div class="oe_form_button_save_dirty">
                     <group string="No Fiscal Year Defined for This Company"
                         attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_fiscal_year','=',True)]}">
                         <label for="date_start" string="Date Range"/>
@@ -63,77 +60,66 @@
                         </div>
                         <field name="period"/>
                     </group>
-                    </div>
 
-                    <group string="Accounting Configuration">
-                        <group>
+                    <group>
+                        <group name="account_config">
+                            <separator string="Accounting Configuration" colspan="2"/>
                             <field name="default_sale_tax" domain="[('type_tax_use','=','sale'), ('company_id','=',company_id)]"
                                 attrs="{'invisible': [('has_chart_of_accounts','=',False)]}"/>
                             <field name="module_account_accountant"/>
                             <field name="currency_id"/>
                             <field name="decimal_precision"/>
-                        </group>
-                        <group>
                             <field name="default_purchase_tax" domain="[('type_tax_use','=','purchase'), ('company_id','=',company_id)]"
                                 attrs="{'invisible': [('has_chart_of_accounts','=',False)]}"/>
                             <field name="module_account_asset"/>
                             <field name="module_account_budget"/>
-                        </group>
-                    </group>
-
-                    <field name="sale_journal_id" invisible="1"/>
-                    <field name="sale_refund_journal_id" invisible="1"/>
-                    <field name="purchase_journal_id" invisible="1"/>
-                    <field name="purchase_refund_journal_id" invisible="1"/>
-                    <group>
-                        <group string="Customer Invoices">
+                            <separator string="Customer Invoices" colspan="2"/>
                             <label for="sale_sequence_next"/>
                             <group>
                                 <field name="sale_sequence_prefix" class="oe_inline" nolabel="1"
                                     help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
-                                <field name="sale_sequence_next" class="oe_inline" nolabel="1" attrs="{'readonly': [('sale_journal_id','=',False)]}"/>
+                                <field name="sale_sequence_next" class="oe_inline" nolabel="1"  attrs="{'readonly': [('sale_journal_id','=',False)]}"/>
                             </group>
                             <label for="sale_refund_sequence_next"/>
                             <group>
-                                <field name="sale_refund_sequence_prefix" class="oe_inline" nolabel="1"
+                                <field name="sale_refund_sequence_prefix" class="oe_inline" nolabel="1" 
                                     help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
-                                <field name="sale_refund_sequence_next" class="oe_inline" nolabel="1" attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/>
+                                <field name="sale_refund_sequence_next" nolabel="1" class="oe_inline" attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/>
                             </group>
                             <field name="module_account_voucher"/>
                             <field name="module_account_followup"/>
                             <field name="group_proforma_invoices"/>
+                            <separator name="analytic_accounting" invisible="1" string="Analytic Accounting"/>
                         </group>
-
-                        <group string="Supplier Invoices">
+                        <group name="other_cofing">
+                            <separator string="Supplier Invoices" colspan="2"/>
                              <label for="purchase_sequence_next"/>
                             <group>
                                 <field name="purchase_sequence_prefix" class="oe_inline" nolabel="1"
                                     help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
-                                <field name="purchase_sequence_next" class="oe_inline" nolabel="1" attrs="{'readonly': [('purchase_journal_id','=',False)]}"/>
+                                <field name="purchase_sequence_next" nolabel="1" class="oe_inline" attrs="{'readonly': [('purchase_journal_id','=',False)]}"/>
                             </group>
                             <label for="purchase_refund_sequence_next"/>
                             <group>
-                                <field name="purchase_refund_sequence_prefix" class="oe_inline" nolabel="1"
+                                <field name="purchase_refund_sequence_prefix" class="oe_inline" nolabel="1" 
                                     help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
-                                <field name="purchase_refund_sequence_next" class="oe_inline" nolabel="1"
-                                  attrs="{'readonly': [('purchase_refund_journal_id','=',False)]}"/>
+                                <field name="purchase_refund_sequence_next" class="oe_inline"
+                                  attrs="{'readonly': [('purchase_refund_journal_id','=',False)]}" nolabel="1"/>
                             </group>
                             <field name="module_account_payment"/>
-                        </group>
-
-                        <group string="Electronic Payments">
+                            <separator string="Electronic Payments" colspan="2"/>
                             <field name="paypal_account" placeholder="sales@openerp.com"/>
-                        </group>
-
-                        <group string="Bank &amp; Cash">
+                            <separator string="Bank &amp; Cash" colspan="2"/>
                             <label for="id" string="Configure Bank Accounts"/>
                             <button name="%(action_bank_tree)d" string="Configure Bank Accounts" icon="gtk-go-forward" type="action"/>
                             <field name="company_footer"/>
                             <field name="module_account_check_writing"/>
                         </group>
-
-                        <group name="analytic_accounting" invisible="1" string="Analytic Accounting"/>
                     </group>
+                    <field name="sale_journal_id" invisible="1"/>
+                    <field name="sale_refund_journal_id" invisible="1"/>
+                    <field name="purchase_journal_id" invisible="1"/>
+                    <field name="purchase_refund_journal_id" invisible="1"/>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index b98eea42ade..301e69e7b75 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -53,13 +53,14 @@
             <field name="inherit_id" ref="account.view_account_config_settings"/>
             <field name="priority" eval="18"/>
             <field name="arch" type="xml">
-                <group name="analytic_accounting" position="attributes">
+                <separator name="analytic_accounting" position="attributes">
                     <attribute name="invisible">0</attribute>
-                </group>
-                <group name="analytic_accounting" position="inside">
+                    <attribute name="colspan">2</attribute>
+                </separator>
+                <separator name="analytic_accounting" position="after">
                     <field name="group_analytic_account_for_purchases"/>
                     <field name="module_purchase_analytic_plans" on_change="onchange_purchase_analytic_plans(module_purchase_analytic_plans)"/>
-                </group>
+                </separator>
             </field>
         </record>
 
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index f81a2818c38..74796bac6fc 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -50,13 +50,14 @@
             <field name="inherit_id" ref="account.view_account_config_settings"/>
             <field name="priority" eval="16"/>
             <field name="arch" type="xml">
-                <group name="analytic_accounting" position="attributes">
+                <separator name="analytic_accounting" position="attributes">
                     <attribute name="invisible">0</attribute>
-                </group>
-                <group name="analytic_accounting" position="inside">
+                    <attribute name="colspan">2</attribute>
+                </separator>
+                <separator name="analytic_accounting" position="after">
                     <field name="group_analytic_account_for_sales"/>
                     <field name="module_sale_analytic_plans" on_change="onchange_sale_analytic_plans(module_sale_analytic_plans)"/>
-                </group>
+                </separator>
             </field>
         </record>
 

From 0215aeca733b1d6e054b729c12b434632c7307da Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 5 Jul 2012 16:51:48 +0530
Subject: [PATCH 25/40] [IMP]minor improvement

bzr revid: sgo@tinyerp.com-20120705112148-sgj52hq0sak21wkg
---
 addons/base_setup/res_config_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index c64f9fc3c4b..a1fd8c18e47 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -61,7 +61,7 @@
                         <group>
                             <group name="config_sale">
                                 <field name="module_crm" invisible="1"/>
-                                <separator string="Emails" colspan="2"/>
+                                <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>

From a8619e4761d43b46cccc4e46a38ae8d6aea6a82f Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Fri, 6 Jul 2012 12:02:17 +0530
Subject: [PATCH 26/40] [IMP]improve name for separotor and button

bzr revid: sgo@tinyerp.com-20120706063217-9d88zieq4adh3mzu
---
 addons/project/res_config_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index 6b725207c69..871c8ed2311 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -25,7 +25,7 @@
                                 <field name="time_unit" domain="[('category_id.name','=','Working Time')]"/>
                             </group>
                             <group name="project_left_column">
-                                <separator string="Project" colspan="2"/>
+                                <separator string="Planing" colspan="2"/>
                                 <field name="module_project_long_term"/>
                                 <separator string="Helpdesk and Support" colspan="2"/>
                                 <field name="module_project_issue"/>

From 4c60b3c9930b50512e95519bf495114e3c2afff5 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Fri, 6 Jul 2012 12:18:48 +0530
Subject: [PATCH 27/40] [IMP]improve sale config view

bzr revid: sgo@tinyerp.com-20120706064848-g6oeyso6n81wafsk
---
 addons/crm/res_config_view.xml       | 4 ++--
 addons/crm_claim/res_config_view.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index 2bc085ac562..96fa16eaa2d 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
-                <field name="module_plugin_outlook" version="7.0" position="after">
+                <separator string="Emails" version="7.0" position="after">
                     <label for="fetchmail_lead"/>
                     <div>
                         <field name="fetchmail_lead"/>
                         <button name="configure_fetchmail_lead" type="object" string="Configure" icon="gtk-go-forward"
                             attrs="{'invisible': [('fetchmail_lead','=',False)]}"/>
                     </div>
-                </field>
+                </separator>
                 <group name="config_other" version="7.0" position="inside">
                     <separator string="Import and Synchronize Data from an Other Application" colspan="2"/>
                     <field name="module_import_sugarcrm"/>
diff --git a/addons/crm_claim/res_config_view.xml b/addons/crm_claim/res_config_view.xml
index 877da7304e8..327bf144544 100644
--- a/addons/crm_claim/res_config_view.xml
+++ b/addons/crm_claim/res_config_view.xml
@@ -9,14 +9,14 @@
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="priority" eval="20"/>       <!-- to put fetchmail_lead before fetchmail_claim -->
             <field name="arch" type="xml">
-                <field name="module_plugin_outlook" version="7.0" position="after">
+                <separator string="Emails" version="7.0" position="after">
                     <label for="fetchmail_claim"/>
                     <div>
                         <field name="fetchmail_claim"/>
                         <button type="object" name="configure_fetchmail_claim" string="Configure" icon="gtk-go-forward"
                             attrs="{'invisible': [('fetchmail_claim','=',False)]}"/>
                     </div>
-                </field>
+                </separator>
             </field>
         </record>
 

From 12bae0d8f901690403cd5d73e161ca6d3bbbe70c Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Fri, 6 Jul 2012 18:04:13 +0530
Subject: [PATCH 28/40] [IMP]improve company form view as per review. improve
 email_template,user form and all action window and also remove sheets from
 configuration

bzr revid: sgo@tinyerp.com-20120706123413-1n615yx09cw2kq36
---
 addons/account/company_view.xml               |  8 ++--
 addons/account/res_config_view.xml            |  2 -
 addons/account_check_writing/account_view.xml |  6 +--
 .../account_voucher/account_voucher_view.xml  |  4 +-
 addons/auth_openid/res_users.xml              |  6 ++-
 addons/base_setup/res_config_view.xml         | 38 +++++++--------
 addons/email_template/email_template_view.xml | 45 ++++++++----------
 .../google_base_account_view.xml              |  7 +--
 addons/hr/res_config_view.xml                 | 44 +++++++++---------
 .../hr_timesheet_sheet_view.xml               |  8 ++--
 addons/knowledge/res_config_view.xml          | 23 ++++------
 addons/mrp/company_view.xml                   |  4 +-
 addons/mrp/res_config_view.xml                | 34 +++++++-------
 addons/pad/res_company.xml                    |  4 +-
 addons/portal/portal_view.xml                 | 28 ++++++-----
 addons/procurement/company_view.xml           |  6 +--
 addons/project/project_view.xml               |  6 +--
 addons/project/res_config_view.xml            | 36 +++++++--------
 addons/purchase/company_view.xml              |  2 +-
 addons/purchase/res_config_view.xml           | 32 ++++++-------
 addons/sale/company_view.xml                  |  2 +-
 addons/stock/res_config_view.xml              | 46 +++++++++----------
 addons/users_ldap/users_ldap_view.xml         |  2 +-
 23 files changed, 180 insertions(+), 213 deletions(-)

diff --git a/addons/account/company_view.xml b/addons/account/company_view.xml
index 6d624ad1729..d5627158d20 100644
--- a/addons/account/company_view.xml
+++ b/addons/account/company_view.xml
@@ -22,10 +22,10 @@
             <field name="model">res.company</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <field name="currency_id" position="after">
-                      <field name="paypal_account"  placeholder="sales@openerp.com"/>
-                      <field name="property_reserve_and_surplus_account" colspan="2"/>
-                </field>
+                <xpath expr="//group[@name='account_grp']" position="inside">
+                    <field name="property_reserve_and_surplus_account"/>
+                    <field name="paypal_account"  placeholder="sales@openerp.com"/>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index ffb785380aa..6e76d3c60e2 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -21,7 +21,6 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <sheet>
                     <field name="has_default_company" invisible="1" />
                     <field name="has_chart_of_accounts" invisible="1"/>
                     <field name="complete_tax_set" invisible="1"/>
@@ -120,7 +119,6 @@
                     <field name="sale_refund_journal_id" invisible="1"/>
                     <field name="purchase_journal_id" invisible="1"/>
                     <field name="purchase_refund_journal_id" invisible="1"/>
-                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/account_check_writing/account_view.xml b/addons/account_check_writing/account_view.xml
index 13b3b820226..5f9dd1dccbb 100644
--- a/addons/account_check_writing/account_view.xml
+++ b/addons/account_check_writing/account_view.xml
@@ -31,10 +31,8 @@
             <field name="priority">17</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[@name='currency']" position="after">
-                    <group string="Default Check Layout">
-                        <field name="check_layout"/>
-                    </group>
+                <xpath expr="//group[@name='account_grp']" position="inside">
+                    <field name="check_layout"/>
                 </xpath>
             </field>
        </record>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 2c294fa628c..925eecf5ab4 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -272,8 +272,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="currency_id" position="after">
-                      <field name="income_currency_exchange_account_id" colspan="2"/>
-                      <field name="expense_currency_exchange_account_id" colspan="2"/>
+                      <field name="income_currency_exchange_account_id"/>
+                      <field name="expense_currency_exchange_account_id"/>
                 </field>
             </field>
         </record>
diff --git a/addons/auth_openid/res_users.xml b/addons/auth_openid/res_users.xml
index e32c2df26c8..df0c31856e2 100644
--- a/addons/auth_openid/res_users.xml
+++ b/addons/auth_openid/res_users.xml
@@ -9,8 +9,10 @@
             <field name="arch" type="xml">
                 <notebook colspan="4" position="inside">
                     <page string="OpenID">
-                        <field name="openid_url"/>
-                        <field name="openid_email"/>
+                        <group>
+                            <field name="openid_url"/>
+                            <field name="openid_email"/>
+                        </group>
                     </page>
                 </notebook>
             </field>
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index a1fd8c18e47..6217bca6645 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -12,26 +12,24 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <sheet>
-                        <group>
-                            <group string="Company Settings">
-                                <field name="module_multi_company"/>
-                                <div>
-                                    You will also find several configuration options on your company data:
-                                    address for the header and footer, overdue payments texts, etc.
-                                </div>
-                                <button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute"/>
-                            </group>
-                            <group string="External Accesses">
-                                <field name="module_share"/>
-                                <field name="module_portal"/>
-                                <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>
+                    <group>
+                        <group string="Company Settings">
+                            <field name="module_multi_company"/>
+                            <div>
+                                You will also find several configuration options on your company data:
+                                address for the header and footer, overdue payments texts, etc.
+                            </div>
+                            <button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute"/>
                         </group>
-                    </sheet>
+                        <group string="External Accesses">
+                            <field name="module_share"/>
+                            <field name="module_portal"/>
+                            <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>
+                    </group>
                 </form>
             </field>
         </record>
@@ -57,7 +55,6 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <sheet>
                         <group>
                             <group name="config_sale">
                                 <field name="module_crm" invisible="1"/>
@@ -68,7 +65,6 @@
                             <group name="config_other">
                             </group>
                         </group>
-                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index 7b64254dfd8..c05502cd3a0 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -17,20 +17,13 @@
                     <notebook>
                         <page string="Email Details">
                             <group>
-                            <group string="Addresses">
                                 <field name="email_from" required="1"/>
                                 <field name="email_to" required="1"/>
                                 <field name="email_cc"/>
                                 <field name="email_bcc"/>
                                 <field name="reply_to"/>
-                            </group>
-                            <group string="Options">
-                                <field name="lang"/>
-                                <field name="user_signature"/>
-                            </group>
-                            <group string="Email Content">
                                 <field name="subject" required="1"/>
-                                <notebook  colspan="2">
+                                <notebook  colspan="4">
                                     <page string="Body (Text)">
                                         <field name="body_text" colspan="4" width="250" height="250" nolabel="1"/>
                                     </page>
@@ -39,22 +32,21 @@
                                         <label string="Note: This is Raw HTML." colspan="4"/>
                                     </page>
                                 </notebook>
-                            </group>
+                                <field name="user_signature"/>
                             <notebook colspan="4">
                                 <page string="Dynamic Values Builder">
-                                    <field name="model_object_field"
-                                        domain="[('model_id','=',model_id),('ttype','!=','one2many'),('ttype','!=','many2many')]"
-                                        on_change="onchange_sub_model_object_value_field(model_object_field)"
-                                        colspan="4"/>
-                                    <field name="sub_object" readonly="1" colspan="4"/>
-                                    <field name="sub_model_object_field"
-                                        domain="[('model_id','=',sub_object),('ttype','!=','one2many'),('ttype','!=','many2many')]"
-                                        colspan="4"
-                                        attrs="{'readonly':[('sub_object','=',False)],'required':[('sub_object','!=',False)]}"
-                                        on_change="onchange_sub_model_object_value_field(model_object_field,sub_model_object_field)"/>
-                                    <field name="null_value" colspan="4"
-                                        on_change="onchange_sub_model_object_value_field(model_object_field,sub_model_object_field,null_value)" />
-                                    <field name="copyvalue" colspan="4"/>
+                                    <group>
+                                        <field name="model_object_field"
+                                            domain="[('model_id','=',model_id),('ttype','!=','one2many'),('ttype','!=','many2many')]"
+                                            on_change="onchange_sub_model_object_value_field(model_object_field)"/>
+                                        <field name="sub_object" readonly="1"/>
+                                        <field name="sub_model_object_field"
+                                            domain="[('model_id','=',sub_object),('ttype','!=','one2many'),('ttype','!=','many2many')]"
+                                            attrs="{'readonly':[('sub_object','=',False)],'required':[('sub_object','!=',False)]}"
+                                            on_change="onchange_sub_model_object_value_field(model_object_field,sub_model_object_field)"/>
+                                        <field name="null_value" on_change="onchange_sub_model_object_value_field(model_object_field,sub_model_object_field,null_value)"/>
+                                        <field name="copyvalue"/>
+                                    </group>
                                 </page>
                             </notebook>
                             <button name="%(wizard_email_template_preview)d" string="Preview Template"
@@ -82,15 +74,18 @@
                                     <field name="track_campaign_item"/>
                                     <field name="message_id"/>
                                     <field name="auto_delete"/>
+                                    <field name="lang"/>
                                 </group>
                             </group>
                             <group colspan="2" col="2">
                                 <separator string="Attachments" colspan="2"/>
                                 <notebook colspan="2">
                                     <page string="Attach Report">
-                                        <field name="report_template" colspan="4"
-                                            domain="[('model','=',model)]"/>
-                                        <field name="report_name" colspan="4" />
+                                        <group>
+                                            <field name="report_template" colspan="4"
+                                                domain="[('model','=',model)]"/>
+                                            <field name="report_name" colspan="4" />
+                                        </group>
                                     </page>
                                     <page string="Attach existing files">
                                         <field name="attachment_ids" colspan="4" nolabel="1" height="350"/>
diff --git a/addons/google_base_account/google_base_account_view.xml b/addons/google_base_account/google_base_account_view.xml
index db189d659db..ec4aa9669fb 100644
--- a/addons/google_base_account/google_base_account_view.xml
+++ b/addons/google_base_account/google_base_account_view.xml
@@ -9,9 +9,10 @@
             <field name="arch" type="xml">
                 <xpath expr="//notebook" position="inside">
                     <page string="Synchronization">
-                        <separator string="Google Account" colspan="4"/>
-                        <field name="gmail_user"/>
-                        <field name="gmail_password" password="True"/>
+                        <group string="Google Account" colspan="4">
+                            <field name="gmail_user"/>
+                            <field name="gmail_password" password="True"/>
+                        </group>
                     </page>
                 </xpath>
             </field>
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index 1916760635d..f9536fc9c24 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -20,30 +20,28 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <sheet>
-                        <group>
-                            <group string="Additional Features" name="left_column">
-                                <field name="module_hr_expense"/>
-                                <field name="module_hr_evaluation"/>
-                                <field name="module_hr_holidays"/>
-                                <field name="module_hr_recruitment"/>
-                                <field name="module_hr_contract"/>
-                                <label for="module_hr_payroll"/>
-                                <div>
-                                    <field name="module_hr_payroll"/>
-                                    <button name="%(open_payroll_modules)d" type="action"
-                                        string="Install Country-Specific Payroll" icon="gtk-go-forward"
-                                        attrs="{'invisible': [('module_hr_payroll','=',False)]}"/>
-                                </div>
-                            </group>
-                            <group name="right_column">
-                                <separator string="Timesheets" colspan="2"/>
-                                <field name="module_hr_attendance" on_change="onchange_hr_attendance(module_hr_attendance)"/>
-                                <field name="module_hr_timesheet" on_change="onchange_hr_timesheet(module_hr_timesheet)"/>
-                                <field name="module_hr_timesheet_sheet"/>
-                            </group>
+                    <group>
+                        <group string="Additional Features" name="left_column">
+                            <field name="module_hr_expense"/>
+                            <field name="module_hr_evaluation"/>
+                            <field name="module_hr_holidays"/>
+                            <field name="module_hr_recruitment"/>
+                            <field name="module_hr_contract"/>
+                            <label for="module_hr_payroll"/>
+                            <div>
+                                <field name="module_hr_payroll"/>
+                                <button name="%(open_payroll_modules)d" type="action"
+                                    string="Install Country-Specific Payroll" icon="gtk-go-forward"
+                                    attrs="{'invisible': [('module_hr_payroll','=',False)]}"/>
+                            </div>
                         </group>
-                    </sheet>
+                        <group name="right_column">
+                            <separator string="Timesheets" colspan="2"/>
+                            <field name="module_hr_attendance" on_change="onchange_hr_attendance(module_hr_attendance)"/>
+                            <field name="module_hr_timesheet" on_change="onchange_hr_timesheet(module_hr_timesheet)"/>
+                            <field name="module_hr_timesheet_sheet"/>
+                        </group>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index b57cb4ccd81..4582061dd38 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -200,11 +200,9 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[@name='currency']" position="after">
-                    <group string="Timesheets">
-                        <field name="timesheet_range"/>
-                        <field name="timesheet_max_difference"/>
-                    </group>
+                <xpath expr="//group[@name='time_grp']" position="inside">
+                    <field name="timesheet_range"/>
+                    <field name="timesheet_max_difference"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
index ad3488deb98..ec4d91683f1 100644
--- a/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@ -11,21 +11,18 @@
                         <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                         or 
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
-
                     </header>
-                    <sheet>
-                        <group>
-                            <group string="Wiki">
-                                <field name="module_wiki_faq"/>
-                                <field name="module_wiki_quality_manual"/>
-                            </group>
-                            <group string="Documents">
-                                <field name="module_document"/>
-                                <field name="module_document_ftp"/>
-                                <field name="module_document_webdav"/>
-                            </group>
+                    <group>
+                        <group string="Wiki">
+                            <field name="module_wiki_faq"/>
+                            <field name="module_wiki_quality_manual"/>
                         </group>
-                    </sheet>
+                        <group string="Documents">
+                            <field name="module_document"/>
+                            <field name="module_document_ftp"/>
+                            <field name="module_document_webdav"/>
+                        </group>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp/company_view.xml b/addons/mrp/company_view.xml
index d7e518699e0..d78036d62bd 100644
--- a/addons/mrp/company_view.xml
+++ b/addons/mrp/company_view.xml
@@ -9,8 +9,8 @@
             <field name="priority">22</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='currency_id']" position="after">
-                        <field name="manufacturing_lead"/>
+                <xpath expr="//group[@name='day_grp']" position="inside">
+                   <field name="manufacturing_lead"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index e81a1d42df4..8d81a3d2d0a 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -12,25 +12,23 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <sheet>
-                        <group>
-                            <group string="Manufacturing Order">
-                                <field name="module_mrp_operations"/>
-                                <field name="module_stock_planning"/>
-                                <field name="module_mrp_subproduct"/>
-                                <field name="module_mrp_repair"/>
-                                <separator string="Logistics" colspan="2"/>
-                                <field name="module_mrp_jit"/>
-                                <field name="module_stock_no_autopicking"/>
-                            </group>
-                            <group string="Products">
-                                <field name="module_product_manufacturer"/>
-                                <separator string="Bill Of Material" colspan="2"/>
-                                <field name="group_mrp_routings"/>
-                                <field name="group_mrp_properties"/>
-                            </group>
+                    <group>
+                        <group string="Manufacturing Order">
+                            <field name="module_mrp_operations"/>
+                            <field name="module_stock_planning"/>
+                            <field name="module_mrp_subproduct"/>
+                            <field name="module_mrp_repair"/>
+                            <separator string="Logistics" colspan="2"/>
+                            <field name="module_mrp_jit"/>
+                            <field name="module_stock_no_autopicking"/>
                         </group>
-                    </sheet>
+                        <group string="Products">
+                            <field name="module_product_manufacturer"/>
+                            <separator string="Bill Of Material" colspan="2"/>
+                            <field name="group_mrp_routings"/>
+                            <field name="group_mrp_properties"/>
+                        </group>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/pad/res_company.xml b/addons/pad/res_company.xml
index 8f65c507c61..fa0504f156b 100644
--- a/addons/pad/res_company.xml
+++ b/addons/pad/res_company.xml
@@ -6,10 +6,8 @@
       <field name="type">form</field>
       <field name="inherit_id" ref="base.view_company_form"/>
       <field name="arch" type="xml">
-        <xpath expr="//group[@name='currency']" position="after">
-          <group string="Pad">
+        <xpath expr="//group[@name='time_grp']" position="inside">
             <field name="pad_url_template"/>
-          </group>
         </xpath>
       </field>
     </record>
diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index 21641f45bc7..794c8ed788b 100644
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -38,11 +38,19 @@ the portal's users.
             <field name="arch" type="xml">
                 <page string="Users" position="before">
                     <page string="Portal">
-                        <group colspan="4" col="2">
-                            <separator string="Website" colspan="2"/>
-                            <field name="url" widget="url"/>
-                        </group>
-                        <group colspan="2" col="2">
+                        <group>
+                            <group>
+                                <field name="url" widget="url" string="Portal URL"/>
+                                <field name="home_action_id"/>
+                            </group>
+                            <group>
+                                <field name="override_menu"/>
+                                <field name="parent_menu_id"
+                                    context="{'ir.ui.menu.full_list': True}"/>
+                                <label colspan="1"/>
+                                <button name="do_create_menu" type="object"
+                                    string="Create Parent Menu"/>
+                            </group>
                             <separator string="Widgets Assigned to Users" colspan="2"/>
                             <field name="widget_ids" nolabel="1" colspan="2">
                                 <tree string="Widgets" editable="bottom">
@@ -51,16 +59,6 @@ the portal's users.
                                 </tree>
                             </field>
                         </group>
-                        <group colspan="2" col="2">
-                            <separator string="Portal Menu" colspan="2"/>
-                            <field name="override_menu"/>
-                            <field name="parent_menu_id"
-                                context="{'ir.ui.menu.full_list': True}"/>
-                            <label colspan="1"/>
-                            <button name="do_create_menu" type="object"
-                                string="Create Parent Menu"/>
-                            <field name="home_action_id"/>
-                        </group>
                     </page>
                 </page>
             </field>
diff --git a/addons/procurement/company_view.xml b/addons/procurement/company_view.xml
index 49e50f8c0f2..3b149ef2a4f 100644
--- a/addons/procurement/company_view.xml
+++ b/addons/procurement/company_view.xml
@@ -9,10 +9,8 @@
             <field name="priority">17</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[@name='currency']" position="after">
-                    <group string="MRP &amp; Logistics Scheduler">
-                        <field name="schedule_range"/>
-                    </group>
+                <xpath expr="//group[@name='day_grp']" position="inside">
+                    <field name="schedule_range"/>
                 </xpath>
             </field>
        </record>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index c6b1839b304..7a0a9f08512 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -826,10 +826,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[@name='currency']" position="after">
-                    <group string="Project Management">
-                        <field name="project_time_mode_id" domain="[('category_id','=','Working Time')]"/>
-                    </group>
+                <xpath expr="//group[@name='time_grp']" position="inside">
+                    <field name="project_time_mode_id" domain="[('category_id','=','Working Time')]"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index 871c8ed2311..6248efde5d2 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -12,27 +12,25 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <sheet>
+                    <group>
                         <group>
-                            <group>
-                                <separator string="Project" colspan="2"/>
-                                <field name="module_project_mrp"/>
-                                <field name="module_project_timesheet"/>
-                                <field name="module_pad"/>
-                                <field name="group_tasks_work_on_tasks"/>
-                                <field name="group_time_work_estimation_tasks"/>
-                                <field name="group_manage_delegation_task"/>
-                                <field name="time_unit" domain="[('category_id.name','=','Working Time')]"/>
-                            </group>
-                            <group name="project_left_column">
-                                <separator string="Planing" colspan="2"/>
-                                <field name="module_project_long_term"/>
-                                <separator string="Helpdesk and Support" colspan="2"/>
-                                <field name="module_project_issue"/>
-                                <field name="module_project_issue_sheet"/>
-                            </group>
+                            <separator string="Project" colspan="2"/>
+                            <field name="module_project_mrp"/>
+                            <field name="module_project_timesheet"/>
+                            <field name="module_pad"/>
+                            <field name="group_tasks_work_on_tasks"/>
+                            <field name="group_time_work_estimation_tasks"/>
+                            <field name="group_manage_delegation_task"/>
+                            <field name="time_unit" domain="[('category_id.name','=','Working Time')]"/>
                         </group>
-                    </sheet>
+                        <group name="project_left_column">
+                            <separator string="Planing" colspan="2"/>
+                            <field name="module_project_long_term"/>
+                            <separator string="Helpdesk and Support" colspan="2"/>
+                            <field name="module_project_issue"/>
+                            <field name="module_project_issue_sheet"/>
+                        </group>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/purchase/company_view.xml b/addons/purchase/company_view.xml
index 9e935fe34fe..0b9fbdfcee5 100644
--- a/addons/purchase/company_view.xml
+++ b/addons/purchase/company_view.xml
@@ -9,7 +9,7 @@
             <field name="priority">19</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='currency_id']" position="after">
+                <xpath expr="//group[@name='day_grp']" position="inside">
                         <field name="po_lead"/>
                 </xpath>
             </field>
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 301e69e7b75..04d966bd1e5 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -12,25 +12,23 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <sheet>
+                    <group>
                         <group>
-                            <group>
-                                <separator string="Invoicing" colspan="2"/>
-                                <field name="default_invoice_method" class="oe_inline"/>
-                                <field name="decimal_precision" class="oe_inline"/>
-                            </group>
-                            <group>
-                                <separator string="Purchase Order" colspan="2"/>
-                                <field name="group_purchase_pricelist"/>
-                                <field name="group_uom"/>
-                                <field name="group_purchase_delivery_address"/>
-                                <field name="module_purchase_double_validation"/>
-                                <field name="module_purchase_requisition"/>
-                                <field name="module_warning"/>
-                                <field name="module_purchase_analytic_plans"/>
-                            </group>
+                            <separator string="Invoicing" colspan="2"/>
+                            <field name="default_invoice_method" class="oe_inline"/>
+                            <field name="decimal_precision" class="oe_inline"/>
                         </group>
-                    </sheet>
+                        <group>
+                            <separator string="Purchase Order" colspan="2"/>
+                            <field name="group_purchase_pricelist"/>
+                            <field name="group_uom"/>
+                            <field name="group_purchase_delivery_address"/>
+                            <field name="module_purchase_double_validation"/>
+                            <field name="module_purchase_requisition"/>
+                            <field name="module_warning"/>
+                            <field name="module_purchase_analytic_plans"/>
+                        </group>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/sale/company_view.xml b/addons/sale/company_view.xml
index 73f67707ce6..e558ca097e7 100644
--- a/addons/sale/company_view.xml
+++ b/addons/sale/company_view.xml
@@ -8,7 +8,7 @@
             <field name="priority">24</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='currency_id']" position="after">
+                <xpath expr="//group[@name='day_grp']" position="inside">
                    <field name="security_lead"/>
                 </xpath>
             </field>
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index d5e3d6f60c5..0503ec544b1 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -13,32 +13,30 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <sheet>
+                    <group>
                         <group>
-                            <group>
-                                <separator string="Traceability" colspan="2"/>
-                                <field name="group_stock_production_lot"/>
-                                <field name="group_stock_tracking_lot"/>
-                                <field name="module_product_expiry"
-                                    attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
-                                 <separator string="Logistics" colspan="2"/>
-                                 <field name="group_stock_multiple_locations"/>
-                                 <field name="module_stock_invoice_directly"/>
-                                 <field name="module_stock_location"/>
-                                 <field name="decimal_precision" class="oe_inline"/>
-                            </group>
-                            <group>
-                                <separator string="Partners" colspan="2"/>
-                                <field name="module_claim_from_delivery"/>
-                                <separator string="Products" colspan="2"/>
-                                <field name="group_stock_packaging"/>
-                                <field name="group_uom"/>
-                                <field name="group_uos"/>
-                                <field name="group_stock_inventory_valuation" class="oe_inline"/>
-                                <field name="group_product_variant"/>
-                            </group>
+                            <separator string="Traceability" colspan="2"/>
+                            <field name="group_stock_production_lot"/>
+                            <field name="group_stock_tracking_lot"/>
+                            <field name="module_product_expiry"
+                                attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
+                             <separator string="Logistics" colspan="2"/>
+                             <field name="group_stock_multiple_locations"/>
+                             <field name="module_stock_invoice_directly"/>
+                             <field name="module_stock_location"/>
+                             <field name="decimal_precision" class="oe_inline"/>
                         </group>
-                    </sheet>
+                        <group>
+                            <separator string="Partners" colspan="2"/>
+                            <field name="module_claim_from_delivery"/>
+                            <separator string="Products" colspan="2"/>
+                            <field name="group_stock_packaging"/>
+                            <field name="group_uom"/>
+                            <field name="group_uos"/>
+                            <field name="group_stock_inventory_valuation" class="oe_inline"/>
+                            <field name="group_product_variant"/>
+                        </group>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/users_ldap/users_ldap_view.xml b/addons/users_ldap/users_ldap_view.xml
index 3664f735836..9a337221935 100644
--- a/addons/users_ldap/users_ldap_view.xml
+++ b/addons/users_ldap/users_ldap_view.xml
@@ -7,7 +7,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[@name='currency']" position="after">
+                <xpath expr="//group[@name='time_grp']" position="after">
                     <field name="ldaps" nolabel="1" colspan="4">
                         <form string="LDAP Configuration" version="7.0">
                             <group col="4">

From 31e5bc02273464b459ef2b4eef5d705f01831dfc Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Fri, 6 Jul 2012 18:39:38 +0530
Subject: [PATCH 29/40] [IMP]show label for working time popup

bzr revid: sgo@tinyerp.com-20120706130938-e89ew8sdb2790b1a
---
 addons/resource/resource_view.xml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index ebcd9c8a25a..6779592f82d 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -135,11 +135,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Working Time" version="7.0">
-                    <field colspan="4" name="name"/>
-                    <field name="date_from"/>
-                    <field name="dayofweek"/>
-                    <field name="hour_from" widget="float_time"/>
-                    <field name="hour_to" widget="float_time"/>
+                    <group>
+                        <field name="name"/>
+                        <field name="date_from"/>
+                        <field name="dayofweek"/>
+                        <field name="hour_from" widget="float_time"/>
+                        <field name="hour_to" widget="float_time"/>
+                    </group>
                 </form>
             </field>
         </record>

From 94d5c91975ef53b02641700f5df936c1958ceb54 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Mon, 9 Jul 2012 11:38:14 +0530
Subject: [PATCH 30/40] [IMP]improve some view and remove errors

bzr revid: sgo@tinyerp.com-20120709060814-3y9vliizd448820o
---
 addons/base_setup/res_config_view.xml | 8 ++++----
 addons/hr/res_config_view.xml         | 4 ----
 addons/hr_payroll/res_config_view.xml | 2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 2bbc6b7391d..5227b0885a9 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -15,6 +15,9 @@
                     <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>
                             <div>
@@ -22,15 +25,12 @@
                                 address for the header and footer, overdue payments texts, etc.
                             </div>
                             <button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute"/>
-                        </group>
-                        <group string="External Accesses">
-                            <field name="module_share"/>
-                            <field name="module_portal"/>
                             <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>
+                        
                     </group>
                 </form>
             </field>
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index bcb82444e4f..0c1d8f9fa04 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -25,8 +25,6 @@
                             <field name="module_hr_expense"/>
                             <field name="module_hr_evaluation"/>
                             <field name="module_hr_holidays"/>
-                        </group>
-                        <group>
                             <field name="module_hr_recruitment"/>
                             <field name="module_hr_contract"/>
                             <label for="module_hr_payroll"/>
@@ -37,8 +35,6 @@
                                     attrs="{'invisible': [('module_hr_payroll','=',False)]}"/>
                             </div>
                         </group>
-                    </group>
-                    <group>
                         <group string="Timesheets">
                             <field name="module_hr_attendance" on_change="onchange_hr_attendance(module_hr_attendance)"/>
                             <field name="module_hr_timesheet" on_change="onchange_hr_timesheet(module_hr_timesheet)"/>
diff --git a/addons/hr_payroll/res_config_view.xml b/addons/hr_payroll/res_config_view.xml
index 051c720667b..c62281892e8 100644
--- a/addons/hr_payroll/res_config_view.xml
+++ b/addons/hr_payroll/res_config_view.xml
@@ -8,7 +8,7 @@
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
                 <!-- put after the element <div><field name="module_hr_payroll" class="oe_inline"/> ...</div> -->
-                <xpath expr="//field[@name='module_hr_payroll']/.." position="after">
+                <xpath expr="//group[@name='left_column']" position="inside">
                     <field name="module_hr_payroll_account"/>
                 </xpath>
             </field>

From 660060516de50396250f2eb69881c4ba09ba5918 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Mon, 9 Jul 2012 12:11:29 +0530
Subject: [PATCH 31/40] [IMP]minor changes

bzr revid: sgo@tinyerp.com-20120709064129-7fkg21rps0he25vh
---
 addons/hr/res_config_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index 0c1d8f9fa04..cf35654475d 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -35,12 +35,11 @@
                                     attrs="{'invisible': [('module_hr_payroll','=',False)]}"/>
                             </div>
                         </group>
-                        <group string="Timesheets">
+                        <group string="Timesheets" name="right_column">
                             <field name="module_hr_attendance" on_change="onchange_hr_attendance(module_hr_attendance)"/>
                             <field name="module_hr_timesheet" on_change="onchange_hr_timesheet(module_hr_timesheet)"/>
                             <field name="module_hr_timesheet_sheet"/>
                         </group>
-                        <group name="config_recruitment"/>
                     </group>
                 </form>
             </field>

From ef74150d31877645761f679e895367da117d9490 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 13 Jul 2012 18:11:58 +0200
Subject: [PATCH 32/40] [IMP] settings: better form view for res.company

bzr revid: qdp-launchpad@openerp.com-20120713161158-w0e5268zip8drzi1
---
 .../hr_timesheet_sheet_view.xml               |  8 ++--
 addons/l10n_ch/company_view.xml               | 28 ++++++------
 addons/mrp/company_view.xml                   |  2 +-
 addons/pad/res_company.xml                    |  6 ++-
 addons/procurement/company_view.xml           |  8 ++--
 addons/project/project_view.xml               |  6 ++-
 addons/purchase/company_view.xml              |  2 +-
 addons/sale/company_view.xml                  |  2 +-
 addons/users_ldap/users_ldap_view.xml         | 44 ++++++++++---------
 9 files changed, 59 insertions(+), 47 deletions(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 4582061dd38..dbc9e1d6dac 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -200,9 +200,11 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[@name='time_grp']" position="inside">
-                    <field name="timesheet_range"/>
-                    <field name="timesheet_max_difference"/>
+                <xpath expr="//group[@name='account_grp']" position="after">
+                    <group name="timesheets_grp" string="Timesheets">
+                        <field name="timesheet_range"/>
+                        <field name="timesheet_max_difference"/>
+                    </group>
                 </xpath>
             </field>
         </record>
diff --git a/addons/l10n_ch/company_view.xml b/addons/l10n_ch/company_view.xml
index 1897c894462..be0d1a922af 100644
--- a/addons/l10n_ch/company_view.xml
+++ b/addons/l10n_ch/company_view.xml
@@ -7,20 +7,22 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//div[@name='bank_acc']" position="after">
-                    <group string="BVR data" colspan="4">
-                        <field name="bvr_delta_horz"/>
-                        <field name="bvr_delta_vert"/>
-                        <field name="bvr_scan_line_vert"/>
-                        <field name="bvr_scan_line_horz"/>
-                        <field name="bvr_scan_line_font_size"/>
-                        <field name="bvr_scan_line_letter_spacing"/>
-                        <field name="bvr_background"/>
-                        <field name="bvr_only"/>
-                        <field name="invoice_only"/>
-                    </group>
+                <xpath expr="//notebook" position="inside">
+                    <page string="BVR Data"/>
+                        <group colspan="4">
+                            <field name="bvr_delta_horz"/>
+                            <field name="bvr_delta_vert"/>
+                            <field name="bvr_scan_line_vert"/>
+                            <field name="bvr_scan_line_horz"/>
+                            <field name="bvr_scan_line_font_size"/>
+                            <field name="bvr_scan_line_letter_spacing"/>
+                            <field name="bvr_background"/>
+                            <field name="bvr_only"/>
+                            <field name="invoice_only"/>
+                        </group>
+                    </page>
                 </xpath>
             </field>
         </record>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/mrp/company_view.xml b/addons/mrp/company_view.xml
index d78036d62bd..e7b24ecce29 100644
--- a/addons/mrp/company_view.xml
+++ b/addons/mrp/company_view.xml
@@ -9,7 +9,7 @@
             <field name="priority">22</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[@name='day_grp']" position="inside">
+                <xpath expr="//group[@name='logistics_grp']" position="inside">
                    <field name="manufacturing_lead"/>
                 </xpath>
             </field>
diff --git a/addons/pad/res_company.xml b/addons/pad/res_company.xml
index fa0504f156b..9b1c0656470 100644
--- a/addons/pad/res_company.xml
+++ b/addons/pad/res_company.xml
@@ -6,8 +6,10 @@
       <field name="type">form</field>
       <field name="inherit_id" ref="base.view_company_form"/>
       <field name="arch" type="xml">
-        <xpath expr="//group[@name='time_grp']" position="inside">
-            <field name="pad_url_template"/>
+        <xpath expr="//group[@name='account_grp']" position="after">
+            <group string="Pads">
+                <field name="pad_url_template"/>
+            </group>
         </xpath>
       </field>
     </record>
diff --git a/addons/procurement/company_view.xml b/addons/procurement/company_view.xml
index 3b149ef2a4f..961775b16dd 100644
--- a/addons/procurement/company_view.xml
+++ b/addons/procurement/company_view.xml
@@ -9,11 +9,13 @@
             <field name="priority">17</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[@name='day_grp']" position="inside">
-                    <field name="schedule_range"/>
+                <xpath expr="//group[@name='account_grp']" position="after">
+                    <group name="logistics_grp" string="Logistics"/>
+                        <field name="schedule_range"/>
+                    </group>
                 </xpath>
             </field>
        </record>
     
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 7d65626dd44..26814892775 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -817,8 +817,10 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[@name='time_grp']" position="inside">
-                    <field name="project_time_mode_id" domain="[('category_id','=','Working Time')]"/>
+                <xpath expr="//group[@name='account_grp']" position="after">
+                    <group name="project_grp" string="Projects">
+                        <field name="project_time_mode_id" domain="[('category_id','=','Working Time')]"/>
+                    </group>
                 </xpath>
             </field>
         </record>
diff --git a/addons/purchase/company_view.xml b/addons/purchase/company_view.xml
index 0b9fbdfcee5..30c6bfa1abf 100644
--- a/addons/purchase/company_view.xml
+++ b/addons/purchase/company_view.xml
@@ -9,7 +9,7 @@
             <field name="priority">19</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[@name='day_grp']" position="inside">
+                <xpath expr="//group[@name='logistics_grp']" position="inside">
                         <field name="po_lead"/>
                 </xpath>
             </field>
diff --git a/addons/sale/company_view.xml b/addons/sale/company_view.xml
index e558ca097e7..fd4289a5bf6 100644
--- a/addons/sale/company_view.xml
+++ b/addons/sale/company_view.xml
@@ -8,7 +8,7 @@
             <field name="priority">24</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[@name='day_grp']" position="inside">
+                <xpath expr="//group[@name='logistics_grp']" position="inside">
                    <field name="security_lead"/>
                 </xpath>
             </field>
diff --git a/addons/users_ldap/users_ldap_view.xml b/addons/users_ldap/users_ldap_view.xml
index 9a337221935..b87800aa8c8 100644
--- a/addons/users_ldap/users_ldap_view.xml
+++ b/addons/users_ldap/users_ldap_view.xml
@@ -7,30 +7,32 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[@name='time_grp']" position="after">
-                    <field name="ldaps" nolabel="1" colspan="4">
-                        <form string="LDAP Configuration" version="7.0">
-                            <group col="4">
+                <xpath expr="//group[@name='account_grp']" position="after">
+                    <group string="LDAP Parameters">
+                        <field name="ldaps" nolabel="1" colspan="4">
+                            <form string="LDAP Configuration" version="7.0">
+                                <group col="4">
+                                    <field name="ldap_server"/>
+                                    <field name="ldap_server_port"/>
+                                    <field name="ldap_binddn"/>
+                                    <field name="ldap_password"/>
+                                    <field name="ldap_base"/>
+                                    <field name="ldap_filter"/>
+                                    <field name="create_user"/>
+                                    <field name="user"/>
+                                    <newline/>
+                                    <field name="sequence"/>
+                                    <field name="ldap_tls"/>
+                                </group>
+                            </form>
+                            <tree string="LDAP Configuration">
+                                <field name="sequence"/>
                                 <field name="ldap_server"/>
                                 <field name="ldap_server_port"/>
-                                <field name="ldap_binddn"/>
-                                <field name="ldap_password"/>
                                 <field name="ldap_base"/>
-                                <field name="ldap_filter"/>
-                                <field name="create_user"/>
-                                <field name="user"/>
-                                <newline/>
-                                <field name="sequence"/>
-                                <field name="ldap_tls"/>
-                            </group>
-                        </form>
-                        <tree string="LDAP Configuration">
-                            <field name="sequence"/>
-                            <field name="ldap_server"/>
-                            <field name="ldap_server_port"/>
-                            <field name="ldap_base"/>
-                        </tree>
-                    </field>
+                            </tree>
+                        </field>
+                    </group>
                 </xpath>
             </field>
         </record>

From 3f3625d3baf6bf787089de9d5bafb7552af11d8a Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 13 Jul 2012 18:16:18 +0200
Subject: [PATCH 33/40] [IMP] settings: better form view for res.company

bzr revid: qdp-launchpad@openerp.com-20120713161618-hu7xp8yhn8ilmjar
---
 addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_view.xml b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_view.xml
index 4bf8cdf018b..eb407917d81 100755
--- a/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_view.xml
+++ b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_view.xml
@@ -11,15 +11,15 @@
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
             <data>
-                 <xpath expr="//notebook" position="inside">
-                    <page string="Paie">
+                 <xpath expr="//group[@name='account_grp']" position="after">
+                    <group string="Paie">
                             <field name="plafond_secu"/>
                             <field name="nombre_employes"/>
                             <newline/>
                             <field name="org_ss"/>
                             <newline/>
                             <field name="conv_coll"/>
-                    </page>
+                    </group>
                  </xpath>
             </data>
             </field>

From f172824ed42546d2e3787fc8effe1f41fbd41156 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Mon, 16 Jul 2012 14:05:20 +0530
Subject: [PATCH 34/40] [IMP]improve view

bzr revid: sgo@tinyerp.com-20120716083520-a0cv3yfd0uxqg0s3
---
 addons/procurement/company_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/procurement/company_view.xml b/addons/procurement/company_view.xml
index 961775b16dd..c2c99fa5d52 100644
--- a/addons/procurement/company_view.xml
+++ b/addons/procurement/company_view.xml
@@ -10,7 +10,7 @@
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//group[@name='account_grp']" position="after">
-                    <group name="logistics_grp" string="Logistics"/>
+                    <group name="logistics_grp" string="Logistics">
                         <field name="schedule_range"/>
                     </group>
                 </xpath>

From 811efa7ab29391868b8d30826641a2e934ad4764 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Mon, 16 Jul 2012 14:26:08 +0530
Subject: [PATCH 35/40] [IMP]improve xml architecture

bzr revid: sgo@tinyerp.com-20120716085608-elwahvnphgl8j9jn
---
 addons/l10n_ch/company_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_ch/company_view.xml b/addons/l10n_ch/company_view.xml
index be0d1a922af..108982526b6 100644
--- a/addons/l10n_ch/company_view.xml
+++ b/addons/l10n_ch/company_view.xml
@@ -8,7 +8,7 @@
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//notebook" position="inside">
-                    <page string="BVR Data"/>
+                    <page string="BVR Data">
                         <group colspan="4">
                             <field name="bvr_delta_horz"/>
                             <field name="bvr_delta_vert"/>

From 002c59502cc37a962af80fe78766662d6269edae Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 16 Jul 2012 12:10:07 +0200
Subject: [PATCH 36/40] [IMP] account: res_config, better use of groups

bzr revid: qdp-launchpad@openerp.com-20120716101007-zas8dba568n3zm1n
---
 addons/account/company_view.xml    |  2 +-
 addons/account/res_config_view.xml | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/addons/account/company_view.xml b/addons/account/company_view.xml
index 4ade4b90876..caaf4ae0bfb 100644
--- a/addons/account/company_view.xml
+++ b/addons/account/company_view.xml
@@ -25,7 +25,7 @@
                 <xpath expr="//group[@name='account_grp']" position="inside">
                     <field name="property_reserve_and_surplus_account"/>
                     <field name="tax_calculation_rounding_method"/>
-                    <field name="paypal_account"  placeholder="sales@openerp.com"/>
+                    <field name="paypal_account" placeholder="sales@openerp.com"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index a79b8fe2ed7..7c8f9179afc 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -61,8 +61,7 @@
                     </group>
 
                     <group>
-                        <group name="account_config">
-                            <separator string="Accounting Configuration" colspan="2"/>
+                        <group name="account_config" string="Accounting Configuration">
                             <field name="default_sale_tax" domain="[('type_tax_use','=','sale'), ('company_id','=',company_id)]"
                                 attrs="{'invisible': [('has_chart_of_accounts','=',False)]}"/>
                             <field name="module_account_accountant"/>
@@ -73,7 +72,8 @@
                             <field name="tax_calculation_rounding_method"/>
                             <field name="module_account_asset"/>
                             <field name="module_account_budget"/>
-                            <separator string="Customer Invoices" colspan="2"/>
+                        </group>
+                        <group name="customer_inv_grp" string="Customer Invoices">
                             <label for="sale_sequence_next"/>
                             <group>
                                 <field name="sale_sequence_prefix" class="oe_inline" nolabel="1"
@@ -91,8 +91,7 @@
                             <field name="group_proforma_invoices"/>
                             <separator name="analytic_accounting" invisible="1" string="Analytic Accounting"/>
                         </group>
-                        <group name="other_cofing">
-                            <separator string="Supplier Invoices" colspan="2"/>
+                        <group name="supplier_inv_grp" string="Supplier Invoices">
                              <label for="purchase_sequence_next"/>
                             <group>
                                 <field name="purchase_sequence_prefix" class="oe_inline" nolabel="1"
@@ -107,9 +106,9 @@
                                   attrs="{'readonly': [('purchase_refund_journal_id','=',False)]}" nolabel="1"/>
                             </group>
                             <field name="module_account_payment"/>
-                            <separator string="Electronic Payments" colspan="2"/>
+                            <separator string="Electronic Payments"/>
                             <field name="paypal_account" placeholder="sales@openerp.com"/>
-                            <separator string="Bank &amp; Cash" colspan="2"/>
+                            <separator string="Bank &amp; Cash"/>
                             <label for="id" string="Configure Bank Accounts"/>
                             <button name="%(action_bank_tree)d" string="Configure Bank Accounts" icon="gtk-go-forward" type="action"/>
                             <field name="company_footer"/>

From ab1a21d2c66f8259f07448a32d24eae646c38e0e Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Mon, 16 Jul 2012 16:14:28 +0530
Subject: [PATCH 37/40] [IMP]sale:res_config view improve

bzr revid: sgo@tinyerp.com-20120716104428-q7ck7ho2q9pfjkkg
---
 addons/base_setup/res_config_view.xml | 13 +++----
 addons/crm/res_config_view.xml        | 23 +++++------
 addons/crm_claim/res_config_view.xml  |  4 +-
 addons/sale/res_config_view.xml       | 55 ++++++++++++++-------------
 4 files changed, 47 insertions(+), 48 deletions(-)

diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 5227b0885a9..3b1aa7b390e 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -57,14 +57,11 @@
                         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 name="config_sale">
+                            <field name="module_crm" invisible="1"/>
+                            <group name="Emails" string="Emails" attrs="{'invisible': [('module_crm','=',False)]}">
+                                <field name="module_plugin_thunderbird"/>
+                                <field name="module_plugin_outlook"/>
                             </group>
                         </group>
                 </form>
diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index 96fa16eaa2d..2dc9bebd1b1 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -8,25 +8,26 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
-                <separator string="Emails" version="7.0" position="after">
+                <group name="Emails" version="7.0" position="inside">
                     <label for="fetchmail_lead"/>
                     <div>
                         <field name="fetchmail_lead"/>
                         <button name="configure_fetchmail_lead" type="object" string="Configure" icon="gtk-go-forward"
                             attrs="{'invisible': [('fetchmail_lead','=',False)]}"/>
                     </div>
-                </separator>
-                <group name="config_other" version="7.0" position="inside">
-                    <separator string="Import and Synchronize Data from an Other Application" colspan="2"/>
-                    <field name="module_import_sugarcrm"/>
-                    <field name="module_crm_caldav"/>
-                    <field name="module_import_google"/>
-                    <separator string="Customer Form" colspan="2"/>
-                    <field name="module_google_map"/>
                 </group>
-                <group name="config_sale" position="inside">
-                    <separator string="Documents and Wiki" colspan="2"/>
+                <group name="config_sale" 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="Customer Form">
+                        <field name="module_google_map"/>
+                    </group>
+                    <group string="Documents and Wiki">
                         <field name="module_wiki_sale_faq"/>
+                    </group>
                 </group>
             </field>
         </record>
diff --git a/addons/crm_claim/res_config_view.xml b/addons/crm_claim/res_config_view.xml
index 327bf144544..27bd5a692c2 100644
--- a/addons/crm_claim/res_config_view.xml
+++ b/addons/crm_claim/res_config_view.xml
@@ -9,14 +9,14 @@
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="priority" eval="20"/>       <!-- to put fetchmail_lead before fetchmail_claim -->
             <field name="arch" type="xml">
-                <separator string="Emails" version="7.0" position="after">
+                <group name="Emails" version="7.0" position="inside">
                     <label for="fetchmail_claim"/>
                     <div>
                         <field name="fetchmail_claim"/>
                         <button type="object" name="configure_fetchmail_claim" string="Configure" icon="gtk-go-forward"
                             attrs="{'invisible': [('fetchmail_claim','=',False)]}"/>
                     </div>
-                </separator>
+                </group>
             </field>
         </record>
 
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index 74796bac6fc..84a723c399d 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -9,33 +9,34 @@
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
                 <group name="config_sale" position="inside">
-                    <field name="module_project_timesheet" invisible="1"/>
-                    <field name="module_project_mrp" invisible="1"/>
-                    <separator string="Sale Order" colspan="2"/>
-                    <field name="group_uom"/>
-                    <field name="group_sale_delivery_address"/>
-                    <field name="group_sale_pricelist"/>
-                    <field name="group_multiple_shops"/>
-                    <field name="module_warning"/>
-                    <field name="decimal_precision"/>
-                    <field name="default_picking_policy" attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}"/>
-                    <field name="group_discount_per_so_line"/>
-                    <field name="module_sale_margin"/>
-                    <field name="module_sale_journal"/>
-                </group>
-                <group name="config_other" position="inside">
-                    <separator string="Invoicing Policy" colspan="2" />
-                    <field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
-                    <field name="group_invoice_deli_orders" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
-                    <field name="task_work" on_change="onchange_task_work(task_work)"/>
-                    <field name="timesheet" on_change="onchange_timesheet(timesheet)"/>
-                    <field name="default_order_policy" attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False)],'required': ['|',('group_invoice_so_lines','=',True),('group_invoice_deli_orders','=',True)]}"/>
-                    <field name="module_delivery" attrs="{'invisible':[('group_invoice_so_lines','=',False), ('group_invoice_deli_orders','=',False)]}"/>
-                    <field name="time_unit" domain="[('category_id.name','=','Working Time')]"
-                        attrs="{'invisible': [('task_work','=',False), ('module_account_analytic_analysis','=',False)],'required': ['|', ('task_work','=',True), ('module_account_analytic_analysis','=',True)]}"/>
-                    <separator string="Contracts" colspan="2"/>
-                    <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 string="Sale Order">
+                        <field name="module_project_timesheet" invisible="1"/>
+                        <field name="module_project_mrp" invisible="1"/>
+                        <field name="group_uom"/>
+                        <field name="group_sale_delivery_address"/>
+                        <field name="group_sale_pricelist"/>
+                        <field name="group_multiple_shops"/>
+                        <field name="module_warning"/>
+                        <field name="decimal_precision"/>
+                        <field name="default_picking_policy" attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}"/>
+                        <field name="group_discount_per_so_line"/>
+                        <field name="module_sale_margin"/>
+                        <field name="module_sale_journal"/>
+                    </group>
+                    <group string="Invoicing Policy">
+                        <field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
+                        <field name="group_invoice_deli_orders" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
+                        <field name="task_work" on_change="onchange_task_work(task_work)"/>
+                        <field name="timesheet" on_change="onchange_timesheet(timesheet)"/>
+                        <field name="default_order_policy" attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False)],'required': ['|',('group_invoice_so_lines','=',True),('group_invoice_deli_orders','=',True)]}"/>
+                        <field name="module_delivery" attrs="{'invisible':[('group_invoice_so_lines','=',False), ('group_invoice_deli_orders','=',False)]}"/>
+                        <field name="time_unit" domain="[('category_id.name','=','Working Time')]"
+                            attrs="{'invisible': [('task_work','=',False), ('module_account_analytic_analysis','=',False)],'required': ['|', ('task_work','=',True), ('module_account_analytic_analysis','=',True)]}"/>
+                    </group>
+                    <group 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>
                 </group>
             </field>
         </record>

From 5aeb69df2e56ee1acd77333d900c26bb4a1741ee Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Mon, 16 Jul 2012 16:32:16 +0530
Subject: [PATCH 38/40] [IMP]base_setup,purchase,stock: Improve res_config view
 for all this

bzr revid: sgo@tinyerp.com-20120716110216-95m1na5o09y934em
---
 addons/base_setup/res_config_view.xml | 19 +++++++++--------
 addons/purchase/res_config_view.xml   |  6 ++----
 addons/stock/res_config_view.xml      | 30 +++++++++++++--------------
 3 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 3b1aa7b390e..e992e381516 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -15,22 +15,23 @@
                     <group>
                         <group string="Company Settings">
                             <field name="module_multi_company"/>
-                            <separator string="External Accesses" colspan="2"/>
+                         </group>
+                         <group string="External Accesses">
                             <field name="module_share"/>
                             <field name="module_portal"/>
-                        </group>
-                        <group>
+                         </group>
+                         <group>
                             <div>
                                 You will also find several configuration options on your company data:
                                 address for the header and footer, overdue payments texts, etc.
                             </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>
-                        
+                         </group>
+                         <group string="Others">
+                             <label for="id" string="Outgoing Mail Servers"/>
+                             <button type="action" name="%(base.action_ir_mail_server_list)d"
+                                string="Configure" icon="gtk-execute"/>
+                         </group>
                     </group>
                 </form>
             </field>
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 9cfcf4ea3d6..10e91f869cc 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -13,8 +13,7 @@
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
                     <group>
-                        <group>
-                            <separator string="Purchase Order" colspan="2"/>
+                        <group string="Purchase Order">
                             <field name="group_purchase_pricelist"/>
                             <field name="group_uom"/>
                             <field name="group_purchase_delivery_address"/>
@@ -23,8 +22,7 @@
                             <field name="module_warning"/>
                             <field name="module_purchase_analytic_plans"/>
                         </group>
-			<group>
-                            <separator string="Invoicing" colspan="2"/>
+                        <group string="Invoicing">
                             <field name="default_invoice_method" class="oe_inline"/>
                             <field name="decimal_precision" class="oe_inline"/>
                         </group>
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index 0503ec544b1..846167d062c 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -14,28 +14,28 @@
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
                     <group>
-                        <group>
-                            <separator string="Traceability" colspan="2"/>
-                            <field name="group_stock_production_lot"/>
-                            <field name="group_stock_tracking_lot"/>
-                            <field name="module_product_expiry"
-                                attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
-                             <separator string="Logistics" colspan="2"/>
-                             <field name="group_stock_multiple_locations"/>
-                             <field name="module_stock_invoice_directly"/>
-                             <field name="module_stock_location"/>
-                             <field name="decimal_precision" class="oe_inline"/>
+                        <group string="Logistics">
+                            <field name="group_stock_multiple_locations"/>
+                            <field name="module_stock_invoice_directly"/>
+                            <field name="module_stock_location"/>
+                            <field name="decimal_precision" class="oe_inline"/>
                         </group>
-                        <group>
-                            <separator string="Partners" colspan="2"/>
-                            <field name="module_claim_from_delivery"/>
-                            <separator string="Products" colspan="2"/>
+                        <group string="Products">
                             <field name="group_stock_packaging"/>
                             <field name="group_uom"/>
                             <field name="group_uos"/>
                             <field name="group_stock_inventory_valuation" class="oe_inline"/>
                             <field name="group_product_variant"/>
                         </group>
+                        <group string="Partners">
+                            <field name="module_claim_from_delivery"/>
+                        </group>
+                        <group string="Traceability">
+                            <field name="group_stock_production_lot"/>
+                            <field name="group_stock_tracking_lot"/>
+                            <field name="module_product_expiry"
+                                attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
+                        </group>
                     </group>
                 </form>
             </field>

From 3dab31051b78b84e10ed055e41012ff78707835d Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Mon, 16 Jul 2012 17:11:58 +0530
Subject: [PATCH 39/40] [IMP]hr,mrp,project:res_config view improvement as per
 suggetion

bzr revid: sgo@tinyerp.com-20120716114158-nef7622tzmnzcpxa
---
 addons/hr/res_config_view.xml             |  6 +++---
 addons/hr_payroll/res_config_view.xml     |  2 +-
 addons/hr_recruitment/res_config_view.xml | 19 ++++++++++---------
 addons/mrp/res_config_view.xml            | 10 ++++++----
 addons/project/res_config_view.xml        | 19 +++++++++----------
 5 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index cf35654475d..91557c9fb88 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -20,8 +20,8 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <group>
-                        <group string="Additional Features" name="left_column">
+                    <group name="hr_grp">
+                        <group string="Additional Features" name="add_feature">
                             <field name="module_hr_expense"/>
                             <field name="module_hr_evaluation"/>
                             <field name="module_hr_holidays"/>
@@ -35,7 +35,7 @@
                                     attrs="{'invisible': [('module_hr_payroll','=',False)]}"/>
                             </div>
                         </group>
-                        <group string="Timesheets" name="right_column">
+                        <group string="Timesheets">
                             <field name="module_hr_attendance" on_change="onchange_hr_attendance(module_hr_attendance)"/>
                             <field name="module_hr_timesheet" on_change="onchange_hr_timesheet(module_hr_timesheet)"/>
                             <field name="module_hr_timesheet_sheet"/>
diff --git a/addons/hr_payroll/res_config_view.xml b/addons/hr_payroll/res_config_view.xml
index c62281892e8..57de4722310 100644
--- a/addons/hr_payroll/res_config_view.xml
+++ b/addons/hr_payroll/res_config_view.xml
@@ -8,7 +8,7 @@
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
                 <!-- put after the element <div><field name="module_hr_payroll" class="oe_inline"/> ...</div> -->
-                <xpath expr="//group[@name='left_column']" position="inside">
+                <xpath expr="//group[@name='add_feature']" position="inside">
                     <field name="module_hr_payroll_account"/>
                 </xpath>
             </field>
diff --git a/addons/hr_recruitment/res_config_view.xml b/addons/hr_recruitment/res_config_view.xml
index 60d6d8d152d..f806bfffa72 100644
--- a/addons/hr_recruitment/res_config_view.xml
+++ b/addons/hr_recruitment/res_config_view.xml
@@ -7,15 +7,16 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
-                <group name="right_column" position="inside">
-                    <separator string="Recruitment" colspan="2"/>
-                    <field name="module_document_ftp"/>
-                    <label for="fetchmail_applicants"/>
-                    <div>
-                        <field name="fetchmail_applicants"/>
-                        <button name="configure_fetchmail_applicants" type="object" string="Configure" icon="gtk-go-forward"
-                            attrs="{'invisible': [('fetchmail_applicants','=',False)]}"/>
-                    </div>
+                <group name="hr_grp" position="inside">
+                    <group string="Recruitment">
+                        <field name="module_document_ftp"/>
+                        <label for="fetchmail_applicants"/>
+                        <div>
+                            <field name="fetchmail_applicants"/>
+                            <button name="configure_fetchmail_applicants" type="object" string="Configure" icon="gtk-go-forward"
+                                attrs="{'invisible': [('fetchmail_applicants','=',False)]}"/>
+                        </div>
+                    </group>
                 </group>
             </field>
         </record>
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 8d81a3d2d0a..9432397b46d 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -18,15 +18,17 @@
                             <field name="module_stock_planning"/>
                             <field name="module_mrp_subproduct"/>
                             <field name="module_mrp_repair"/>
-                            <separator string="Logistics" colspan="2"/>
+                        </group>
+                        <group string="Bill Of Material">
+                            <field name="group_mrp_routings"/>
+                            <field name="group_mrp_properties"/>
+                        </group>
+                        <group string="Logistics">
                             <field name="module_mrp_jit"/>
                             <field name="module_stock_no_autopicking"/>
                         </group>
                         <group string="Products">
                             <field name="module_product_manufacturer"/>
-                            <separator string="Bill Of Material" colspan="2"/>
-                            <field name="group_mrp_routings"/>
-                            <field name="group_mrp_properties"/>
                         </group>
                     </group>
                 </form>
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index 6248efde5d2..c7318a159ef 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -13,8 +13,7 @@
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
                     <group>
-                        <group>
-                            <separator string="Project" colspan="2"/>
+                        <group string="Project">
                             <field name="module_project_mrp"/>
                             <field name="module_project_timesheet"/>
                             <field name="module_pad"/>
@@ -22,14 +21,14 @@
                             <field name="group_time_work_estimation_tasks"/>
                             <field name="group_manage_delegation_task"/>
                             <field name="time_unit" domain="[('category_id.name','=','Working Time')]"/>
-                        </group>
-                        <group name="project_left_column">
-                            <separator string="Planing" colspan="2"/>
-                            <field name="module_project_long_term"/>
-                            <separator string="Helpdesk and Support" colspan="2"/>
-                            <field name="module_project_issue"/>
-                            <field name="module_project_issue_sheet"/>
-                        </group>
+                       </group>
+                       <group string="Planing">
+                           <field name="module_project_long_term"/>
+                       </group>
+                       <group string="Helpdesk and Support">
+                           <field name="module_project_issue"/>
+                           <field name="module_project_issue_sheet"/>
+                       </group>
                     </group>
                 </form>
             </field>

From b1d19923dedeac9361abe3247a5940c6bf2015af Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 16 Jul 2012 15:43:14 +0200
Subject: [PATCH 40/40] [REV] settings: reverted to revision 6971, for
 usability purposes

bzr revid: qdp-launchpad@openerp.com-20120716134314-os07j9sxreqc39tl
---
 addons/account/company_view.xml           |  2 +-
 addons/account/res_config_view.xml        | 13 +++---
 addons/base_setup/res_config_view.xml     | 32 ++++++-------
 addons/crm/res_config_view.xml            | 23 +++++-----
 addons/crm_claim/res_config_view.xml      |  4 +-
 addons/hr/res_config_view.xml             |  6 +--
 addons/hr_payroll/res_config_view.xml     |  2 +-
 addons/hr_recruitment/res_config_view.xml | 19 ++++----
 addons/mrp/res_config_view.xml            | 10 ++---
 addons/project/res_config_view.xml        | 19 ++++----
 addons/purchase/res_config_view.xml       |  6 ++-
 addons/sale/res_config_view.xml           | 55 +++++++++++------------
 addons/stock/res_config_view.xml          | 30 ++++++-------
 13 files changed, 111 insertions(+), 110 deletions(-)

diff --git a/addons/account/company_view.xml b/addons/account/company_view.xml
index caaf4ae0bfb..4ade4b90876 100644
--- a/addons/account/company_view.xml
+++ b/addons/account/company_view.xml
@@ -25,7 +25,7 @@
                 <xpath expr="//group[@name='account_grp']" position="inside">
                     <field name="property_reserve_and_surplus_account"/>
                     <field name="tax_calculation_rounding_method"/>
-                    <field name="paypal_account" placeholder="sales@openerp.com"/>
+                    <field name="paypal_account"  placeholder="sales@openerp.com"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index 7c8f9179afc..a79b8fe2ed7 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -61,7 +61,8 @@
                     </group>
 
                     <group>
-                        <group name="account_config" string="Accounting Configuration">
+                        <group name="account_config">
+                            <separator string="Accounting Configuration" colspan="2"/>
                             <field name="default_sale_tax" domain="[('type_tax_use','=','sale'), ('company_id','=',company_id)]"
                                 attrs="{'invisible': [('has_chart_of_accounts','=',False)]}"/>
                             <field name="module_account_accountant"/>
@@ -72,8 +73,7 @@
                             <field name="tax_calculation_rounding_method"/>
                             <field name="module_account_asset"/>
                             <field name="module_account_budget"/>
-                        </group>
-                        <group name="customer_inv_grp" string="Customer Invoices">
+                            <separator string="Customer Invoices" colspan="2"/>
                             <label for="sale_sequence_next"/>
                             <group>
                                 <field name="sale_sequence_prefix" class="oe_inline" nolabel="1"
@@ -91,7 +91,8 @@
                             <field name="group_proforma_invoices"/>
                             <separator name="analytic_accounting" invisible="1" string="Analytic Accounting"/>
                         </group>
-                        <group name="supplier_inv_grp" string="Supplier Invoices">
+                        <group name="other_cofing">
+                            <separator string="Supplier Invoices" colspan="2"/>
                              <label for="purchase_sequence_next"/>
                             <group>
                                 <field name="purchase_sequence_prefix" class="oe_inline" nolabel="1"
@@ -106,9 +107,9 @@
                                   attrs="{'readonly': [('purchase_refund_journal_id','=',False)]}" nolabel="1"/>
                             </group>
                             <field name="module_account_payment"/>
-                            <separator string="Electronic Payments"/>
+                            <separator string="Electronic Payments" colspan="2"/>
                             <field name="paypal_account" placeholder="sales@openerp.com"/>
-                            <separator string="Bank &amp; Cash"/>
+                            <separator string="Bank &amp; Cash" colspan="2"/>
                             <label for="id" string="Configure Bank Accounts"/>
                             <button name="%(action_bank_tree)d" string="Configure Bank Accounts" icon="gtk-go-forward" type="action"/>
                             <field name="company_footer"/>
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index e992e381516..5227b0885a9 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -15,23 +15,22 @@
                     <group>
                         <group string="Company Settings">
                             <field name="module_multi_company"/>
-                         </group>
-                         <group string="External Accesses">
+                            <separator string="External Accesses" colspan="2"/>
                             <field name="module_share"/>
                             <field name="module_portal"/>
-                         </group>
-                         <group>
+                        </group>
+                        <group>
                             <div>
                                 You will also find several configuration options on your company data:
                                 address for the header and footer, overdue payments texts, etc.
                             </div>
                             <button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute"/>
-                         </group>
-                         <group string="Others">
-                             <label for="id" string="Outgoing Mail Servers"/>
-                             <button type="action" name="%(base.action_ir_mail_server_list)d"
-                                string="Configure" icon="gtk-execute"/>
-                         </group>
+                            <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>
+                        
                     </group>
                 </form>
             </field>
@@ -58,11 +57,14 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                        <group name="config_sale">
-                            <field name="module_crm" invisible="1"/>
-                            <group name="Emails" string="Emails" attrs="{'invisible': [('module_crm','=',False)]}">
-                                <field name="module_plugin_thunderbird"/>
-                                <field name="module_plugin_outlook"/>
+                        <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>
                         </group>
                 </form>
diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index 2dc9bebd1b1..96fa16eaa2d 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -8,26 +8,25 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
-                <group name="Emails" version="7.0" position="inside">
+                <separator string="Emails" version="7.0" position="after">
                     <label for="fetchmail_lead"/>
                     <div>
                         <field name="fetchmail_lead"/>
                         <button name="configure_fetchmail_lead" type="object" string="Configure" icon="gtk-go-forward"
                             attrs="{'invisible': [('fetchmail_lead','=',False)]}"/>
                     </div>
+                </separator>
+                <group name="config_other" version="7.0" position="inside">
+                    <separator string="Import and Synchronize Data from an Other Application" colspan="2"/>
+                    <field name="module_import_sugarcrm"/>
+                    <field name="module_crm_caldav"/>
+                    <field name="module_import_google"/>
+                    <separator string="Customer Form" colspan="2"/>
+                    <field name="module_google_map"/>
                 </group>
-                <group name="config_sale" 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="Customer Form">
-                        <field name="module_google_map"/>
-                    </group>
-                    <group string="Documents and Wiki">
+                <group name="config_sale" position="inside">
+                    <separator string="Documents and Wiki" colspan="2"/>
                         <field name="module_wiki_sale_faq"/>
-                    </group>
                 </group>
             </field>
         </record>
diff --git a/addons/crm_claim/res_config_view.xml b/addons/crm_claim/res_config_view.xml
index 27bd5a692c2..327bf144544 100644
--- a/addons/crm_claim/res_config_view.xml
+++ b/addons/crm_claim/res_config_view.xml
@@ -9,14 +9,14 @@
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="priority" eval="20"/>       <!-- to put fetchmail_lead before fetchmail_claim -->
             <field name="arch" type="xml">
-                <group name="Emails" version="7.0" position="inside">
+                <separator string="Emails" version="7.0" position="after">
                     <label for="fetchmail_claim"/>
                     <div>
                         <field name="fetchmail_claim"/>
                         <button type="object" name="configure_fetchmail_claim" string="Configure" icon="gtk-go-forward"
                             attrs="{'invisible': [('fetchmail_claim','=',False)]}"/>
                     </div>
-                </group>
+                </separator>
             </field>
         </record>
 
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index 91557c9fb88..cf35654475d 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -20,8 +20,8 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <group name="hr_grp">
-                        <group string="Additional Features" name="add_feature">
+                    <group>
+                        <group string="Additional Features" name="left_column">
                             <field name="module_hr_expense"/>
                             <field name="module_hr_evaluation"/>
                             <field name="module_hr_holidays"/>
@@ -35,7 +35,7 @@
                                     attrs="{'invisible': [('module_hr_payroll','=',False)]}"/>
                             </div>
                         </group>
-                        <group string="Timesheets">
+                        <group string="Timesheets" name="right_column">
                             <field name="module_hr_attendance" on_change="onchange_hr_attendance(module_hr_attendance)"/>
                             <field name="module_hr_timesheet" on_change="onchange_hr_timesheet(module_hr_timesheet)"/>
                             <field name="module_hr_timesheet_sheet"/>
diff --git a/addons/hr_payroll/res_config_view.xml b/addons/hr_payroll/res_config_view.xml
index 57de4722310..c62281892e8 100644
--- a/addons/hr_payroll/res_config_view.xml
+++ b/addons/hr_payroll/res_config_view.xml
@@ -8,7 +8,7 @@
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
                 <!-- put after the element <div><field name="module_hr_payroll" class="oe_inline"/> ...</div> -->
-                <xpath expr="//group[@name='add_feature']" position="inside">
+                <xpath expr="//group[@name='left_column']" position="inside">
                     <field name="module_hr_payroll_account"/>
                 </xpath>
             </field>
diff --git a/addons/hr_recruitment/res_config_view.xml b/addons/hr_recruitment/res_config_view.xml
index f806bfffa72..60d6d8d152d 100644
--- a/addons/hr_recruitment/res_config_view.xml
+++ b/addons/hr_recruitment/res_config_view.xml
@@ -7,16 +7,15 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
-                <group name="hr_grp" position="inside">
-                    <group string="Recruitment">
-                        <field name="module_document_ftp"/>
-                        <label for="fetchmail_applicants"/>
-                        <div>
-                            <field name="fetchmail_applicants"/>
-                            <button name="configure_fetchmail_applicants" type="object" string="Configure" icon="gtk-go-forward"
-                                attrs="{'invisible': [('fetchmail_applicants','=',False)]}"/>
-                        </div>
-                    </group>
+                <group name="right_column" position="inside">
+                    <separator string="Recruitment" colspan="2"/>
+                    <field name="module_document_ftp"/>
+                    <label for="fetchmail_applicants"/>
+                    <div>
+                        <field name="fetchmail_applicants"/>
+                        <button name="configure_fetchmail_applicants" type="object" string="Configure" icon="gtk-go-forward"
+                            attrs="{'invisible': [('fetchmail_applicants','=',False)]}"/>
+                    </div>
                 </group>
             </field>
         </record>
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 9432397b46d..8d81a3d2d0a 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -18,17 +18,15 @@
                             <field name="module_stock_planning"/>
                             <field name="module_mrp_subproduct"/>
                             <field name="module_mrp_repair"/>
-                        </group>
-                        <group string="Bill Of Material">
-                            <field name="group_mrp_routings"/>
-                            <field name="group_mrp_properties"/>
-                        </group>
-                        <group string="Logistics">
+                            <separator string="Logistics" colspan="2"/>
                             <field name="module_mrp_jit"/>
                             <field name="module_stock_no_autopicking"/>
                         </group>
                         <group string="Products">
                             <field name="module_product_manufacturer"/>
+                            <separator string="Bill Of Material" colspan="2"/>
+                            <field name="group_mrp_routings"/>
+                            <field name="group_mrp_properties"/>
                         </group>
                     </group>
                 </form>
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index c7318a159ef..6248efde5d2 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -13,7 +13,8 @@
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
                     <group>
-                        <group string="Project">
+                        <group>
+                            <separator string="Project" colspan="2"/>
                             <field name="module_project_mrp"/>
                             <field name="module_project_timesheet"/>
                             <field name="module_pad"/>
@@ -21,14 +22,14 @@
                             <field name="group_time_work_estimation_tasks"/>
                             <field name="group_manage_delegation_task"/>
                             <field name="time_unit" domain="[('category_id.name','=','Working Time')]"/>
-                       </group>
-                       <group string="Planing">
-                           <field name="module_project_long_term"/>
-                       </group>
-                       <group string="Helpdesk and Support">
-                           <field name="module_project_issue"/>
-                           <field name="module_project_issue_sheet"/>
-                       </group>
+                        </group>
+                        <group name="project_left_column">
+                            <separator string="Planing" colspan="2"/>
+                            <field name="module_project_long_term"/>
+                            <separator string="Helpdesk and Support" colspan="2"/>
+                            <field name="module_project_issue"/>
+                            <field name="module_project_issue_sheet"/>
+                        </group>
                     </group>
                 </form>
             </field>
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 10e91f869cc..9cfcf4ea3d6 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -13,7 +13,8 @@
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
                     <group>
-                        <group string="Purchase Order">
+                        <group>
+                            <separator string="Purchase Order" colspan="2"/>
                             <field name="group_purchase_pricelist"/>
                             <field name="group_uom"/>
                             <field name="group_purchase_delivery_address"/>
@@ -22,7 +23,8 @@
                             <field name="module_warning"/>
                             <field name="module_purchase_analytic_plans"/>
                         </group>
-                        <group string="Invoicing">
+			<group>
+                            <separator string="Invoicing" colspan="2"/>
                             <field name="default_invoice_method" class="oe_inline"/>
                             <field name="decimal_precision" class="oe_inline"/>
                         </group>
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index 84a723c399d..74796bac6fc 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -9,34 +9,33 @@
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
                 <group name="config_sale" position="inside">
-                    <group string="Sale Order">
-                        <field name="module_project_timesheet" invisible="1"/>
-                        <field name="module_project_mrp" invisible="1"/>
-                        <field name="group_uom"/>
-                        <field name="group_sale_delivery_address"/>
-                        <field name="group_sale_pricelist"/>
-                        <field name="group_multiple_shops"/>
-                        <field name="module_warning"/>
-                        <field name="decimal_precision"/>
-                        <field name="default_picking_policy" attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}"/>
-                        <field name="group_discount_per_so_line"/>
-                        <field name="module_sale_margin"/>
-                        <field name="module_sale_journal"/>
-                    </group>
-                    <group string="Invoicing Policy">
-                        <field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
-                        <field name="group_invoice_deli_orders" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
-                        <field name="task_work" on_change="onchange_task_work(task_work)"/>
-                        <field name="timesheet" on_change="onchange_timesheet(timesheet)"/>
-                        <field name="default_order_policy" attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False)],'required': ['|',('group_invoice_so_lines','=',True),('group_invoice_deli_orders','=',True)]}"/>
-                        <field name="module_delivery" attrs="{'invisible':[('group_invoice_so_lines','=',False), ('group_invoice_deli_orders','=',False)]}"/>
-                        <field name="time_unit" domain="[('category_id.name','=','Working Time')]"
-                            attrs="{'invisible': [('task_work','=',False), ('module_account_analytic_analysis','=',False)],'required': ['|', ('task_work','=',True), ('module_account_analytic_analysis','=',True)]}"/>
-                    </group>
-                    <group 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>
+                    <field name="module_project_timesheet" invisible="1"/>
+                    <field name="module_project_mrp" invisible="1"/>
+                    <separator string="Sale Order" colspan="2"/>
+                    <field name="group_uom"/>
+                    <field name="group_sale_delivery_address"/>
+                    <field name="group_sale_pricelist"/>
+                    <field name="group_multiple_shops"/>
+                    <field name="module_warning"/>
+                    <field name="decimal_precision"/>
+                    <field name="default_picking_policy" attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}"/>
+                    <field name="group_discount_per_so_line"/>
+                    <field name="module_sale_margin"/>
+                    <field name="module_sale_journal"/>
+                </group>
+                <group name="config_other" position="inside">
+                    <separator string="Invoicing Policy" colspan="2" />
+                    <field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
+                    <field name="group_invoice_deli_orders" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
+                    <field name="task_work" on_change="onchange_task_work(task_work)"/>
+                    <field name="timesheet" on_change="onchange_timesheet(timesheet)"/>
+                    <field name="default_order_policy" attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False)],'required': ['|',('group_invoice_so_lines','=',True),('group_invoice_deli_orders','=',True)]}"/>
+                    <field name="module_delivery" attrs="{'invisible':[('group_invoice_so_lines','=',False), ('group_invoice_deli_orders','=',False)]}"/>
+                    <field name="time_unit" domain="[('category_id.name','=','Working Time')]"
+                        attrs="{'invisible': [('task_work','=',False), ('module_account_analytic_analysis','=',False)],'required': ['|', ('task_work','=',True), ('module_account_analytic_analysis','=',True)]}"/>
+                    <separator string="Contracts" colspan="2"/>
+                    <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>
             </field>
         </record>
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index 846167d062c..0503ec544b1 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -14,28 +14,28 @@
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
                     <group>
-                        <group string="Logistics">
-                            <field name="group_stock_multiple_locations"/>
-                            <field name="module_stock_invoice_directly"/>
-                            <field name="module_stock_location"/>
-                            <field name="decimal_precision" class="oe_inline"/>
+                        <group>
+                            <separator string="Traceability" colspan="2"/>
+                            <field name="group_stock_production_lot"/>
+                            <field name="group_stock_tracking_lot"/>
+                            <field name="module_product_expiry"
+                                attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
+                             <separator string="Logistics" colspan="2"/>
+                             <field name="group_stock_multiple_locations"/>
+                             <field name="module_stock_invoice_directly"/>
+                             <field name="module_stock_location"/>
+                             <field name="decimal_precision" class="oe_inline"/>
                         </group>
-                        <group string="Products">
+                        <group>
+                            <separator string="Partners" colspan="2"/>
+                            <field name="module_claim_from_delivery"/>
+                            <separator string="Products" colspan="2"/>
                             <field name="group_stock_packaging"/>
                             <field name="group_uom"/>
                             <field name="group_uos"/>
                             <field name="group_stock_inventory_valuation" class="oe_inline"/>
                             <field name="group_product_variant"/>
                         </group>
-                        <group string="Partners">
-                            <field name="module_claim_from_delivery"/>
-                        </group>
-                        <group string="Traceability">
-                            <field name="group_stock_production_lot"/>
-                            <field name="group_stock_tracking_lot"/>
-                            <field name="module_product_expiry"
-                                attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
-                        </group>
                     </group>
                 </form>
             </field>