From d62297df7890ef9224044b189f189e822c63a006 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 25 Jun 2012 09:56:32 +0200
Subject: [PATCH] [IMP] hr, hr_payroll, hr_recruitment, hr_timesheet_sheet:
 improve config wizard form

bzr revid: rco@openerp.com-20120625075632-rycdswuz3widi6wb
---
 addons/hr/res_config_view.xml                 | 13 +++++++------
 addons/hr_payroll/res_config_view.xml         |  5 +++--
 addons/hr_recruitment/res_config_view.xml     | 18 ++++++++++--------
 addons/hr_timesheet_sheet/res_config_view.xml |  5 ++---
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index 0774af7ee47..b2f23f0ce73 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -31,20 +31,21 @@
                                 <field name="module_hr_contract"/>
                                 <label for="module_hr_payroll"/>
                                 <div>
-                                    <field name="module_hr_payroll" class="oe_inline"/>
-                                    <button name="%(open_payroll_modules)d" type="action" class="oe_inline"
-                                        string="Install Country-Specific Payroll" icon="gtk-go-forward"/>
+                                    <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>
-                        <group string="Timesheets">
-                            <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)"/>
                                 <field name="module_hr_timesheet_sheet"/>
                             </group>
+                            <group name="config_recruitment"/>
                         </group>
-                        <group name="config_recruitment"/>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/hr_payroll/res_config_view.xml b/addons/hr_payroll/res_config_view.xml
index c2f760d8864..051c720667b 100644
--- a/addons/hr_payroll/res_config_view.xml
+++ b/addons/hr_payroll/res_config_view.xml
@@ -7,9 +7,10 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
-                <field name="module_hr_holidays" position="after">
+                <!-- put after the element <div><field name="module_hr_payroll" class="oe_inline"/> ...</div> -->
+                <xpath expr="//field[@name='module_hr_payroll']/.." position="after">
                     <field name="module_hr_payroll_account"/>
-                </field>
+                </xpath>
             </field>
         </record>
     </data>
diff --git a/addons/hr_recruitment/res_config_view.xml b/addons/hr_recruitment/res_config_view.xml
index 542f89a279f..011e3816c2c 100644
--- a/addons/hr_recruitment/res_config_view.xml
+++ b/addons/hr_recruitment/res_config_view.xml
@@ -7,14 +7,16 @@
             <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="after">
-                    <separator  string="Recruitment" colspan="4"/>
-                    <field name="module_document_ftp"/>
-                    <newline/>
-                    <field name="fetchmail_applicants"/>
-                     <group attrs="{'invisible': [('fetchmail_applicants','=',False)]}">
-                        <button colspan="2" type="object" name="configure_fetchmail_applicants" string="Configure" icon="gtk-execute"/>
-                     </group>
+                <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>
             </field>
         </record>
diff --git a/addons/hr_timesheet_sheet/res_config_view.xml b/addons/hr_timesheet_sheet/res_config_view.xml
index 6d8c998eec7..61ebee2412b 100644
--- a/addons/hr_timesheet_sheet/res_config_view.xml
+++ b/addons/hr_timesheet_sheet/res_config_view.xml
@@ -8,9 +8,8 @@
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
                 <field name="module_hr_timesheet_sheet" position="after">
-                    <newline/>
-                    <field name="timesheet_range" attrs="{'invisible':[('module_hr_timesheet_sheet','=',False)],'required': [('module_hr_timesheet_sheet','=',True)]}"/>
-                    <field name="timesheet_max_difference" attrs="{'invisible':[('module_hr_timesheet_sheet','=',False)],'required': [('module_hr_timesheet_sheet','=',True)]}"/>
+                    <field name="timesheet_range" attrs="{'invisible': [('module_hr_timesheet_sheet','=',False)], 'required': [('module_hr_timesheet_sheet','=',True)]}"/>
+                    <field name="timesheet_max_difference" attrs="{'invisible': [('module_hr_timesheet_sheet','=',False)], 'required': [('module_hr_timesheet_sheet','=',True)]}"/>
                 </field>
             </field>
         </record>