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] [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>