From 98b91589cfaaebe22f80df9d3b56de72eb967d4d Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 10 Apr 2012 14:22:34 +0200
Subject: [PATCH] [IMP] hr.config.settings: improve form layout

bzr revid: rco@openerp.com-20120410122234-m5n9it4hy07knte2
---
 addons/hr/res_config_view.xml                 | 18 +++++++++++------
 .../hr_evaluation/hr_evaluation_installer.xml |  6 ++++--
 .../hr_expense/hr_expense_installer_view.xml  |  6 ++++--
 addons/hr_holidays/hr_holidays_view.xml       |  5 ++++-
 addons/hr_recruitment/res_config_view.xml     | 20 +++++++++++--------
 addons/hr_timesheet_sheet/res_config_view.xml |  5 ++++-
 6 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index 4dc13bb9dab..f195cb1894a 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -17,13 +17,17 @@
                     <separator string="Human Resources" colspan="4"/>
                     <label string="Departments :"/>
                     <label colspan="1"/>
-                    <button name="%(view_department_form_installer)d" string="Create Your Departments"
-                        type="action" icon="terp-personal+"/>
+                    <group colspan="2">
+                        <button name="%(view_department_form_installer)d" string="Create Your Departments"
+                            type="action" icon="terp-personal+"/>
+                    </group>
                     <newline/>
                     <label string="Employees :" />
                     <label colspan="1"/>
-                    <button name="%(open_view_employee_list_my)d" string="Create Your Employees"
-                        type="action" icon="terp-personal"/>
+                    <group colspan="2">
+                        <button name="%(open_view_employee_list_my)d" string="Create Your Employees"
+                            type="action" icon="terp-personal"/>
+                    </group>
                     <newline/>
                     <field name="module_hr_timesheet_sheet"/>
                     <newline/>
@@ -31,8 +35,10 @@
                     <newline/>
                     <label string="Salary Rules :"/>
                     <label colspan="1"/>
-                    <button string="Configure Your Salary Rules" icon="gtk-go-forward"
-                        name="%(open_payroll1_modules)d" type="action" />
+                    <group colspan="2">
+                        <button string="Configure Your Salary Rules" icon="gtk-go-forward"
+                            name="%(open_payroll1_modules)d" type="action" />
+                    </group>
 
                     <separator string="Additional Features" colspan="4"/>
                     <field name="module_hr_expense"/>
diff --git a/addons/hr_evaluation/hr_evaluation_installer.xml b/addons/hr_evaluation/hr_evaluation_installer.xml
index 412213733a9..c8ac9050368 100644
--- a/addons/hr_evaluation/hr_evaluation_installer.xml
+++ b/addons/hr_evaluation/hr_evaluation_installer.xml
@@ -18,8 +18,10 @@
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
                 <field name="module_hr_evaluation" position="after">
-                    <button name="%(action_evaluation_plans_installer)d" string="Review Appraisal Plans"
-                        type="action" icon="terp-stock_align_left_24"/>
+                    <group colspan="2">
+                        <button name="%(action_evaluation_plans_installer)d" string="Review Appraisal Plans"
+                            type="action" icon="terp-stock_align_left_24"/>
+                    </group>
                 </field>
             </field>
         </record>
diff --git a/addons/hr_expense/hr_expense_installer_view.xml b/addons/hr_expense/hr_expense_installer_view.xml
index ec500b955ae..aa9b551df6c 100644
--- a/addons/hr_expense/hr_expense_installer_view.xml
+++ b/addons/hr_expense/hr_expense_installer_view.xml
@@ -35,8 +35,10 @@
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
                 <field name="module_hr_expense" position="after">
-                    <button name="%(product_normal_form_view_installer)d" string="Review Expenses Products"
-                        type="action" icon="terp-accessories-archiver"/>
+                    <group colspan="2">
+                        <button name="%(product_normal_form_view_installer)d" string="Review Expenses Products"
+                            type="action" icon="terp-accessories-archiver"/>
+                    </group>
                 </field>
             </field>
         </record>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index d212bef3b23..9cb7c4d6a32 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -493,7 +493,10 @@
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
                 <field name="module_hr_holidays" position="after">
-                	<button name="%(hr_holidays.hr_holidays_leaves_assign_legal)d" string="Allocate Leaves" type="action" icon="gtk-apply"/>
+                    <group colspan="2">
+                        <button name="%(hr_holidays.hr_holidays_leaves_assign_legal)d" string="Allocate Leaves"
+                            type="action" icon="gtk-apply"/>
+                    </group>
                 </field>
             </field>
         </record>
diff --git a/addons/hr_recruitment/res_config_view.xml b/addons/hr_recruitment/res_config_view.xml
index 1a50fc543a9..d056d493e2b 100644
--- a/addons/hr_recruitment/res_config_view.xml
+++ b/addons/hr_recruitment/res_config_view.xml
@@ -8,8 +8,10 @@
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
                 <field name="module_hr_recruitment" position="after">
-                    <button name="%(hr_recruitment_stage_form_installer)d" string="Review Recruitment Stages"
-                        type="action" icon="terp-stage"/>
+                    <group colspan="2">
+                        <button name="%(hr_recruitment_stage_form_installer)d" string="Review Recruitment Stages"
+                            type="action" icon="terp-stage"/>
+                    </group>
                 </field>
                 <group name="config_recruitment" position="after">
                     <separator  string="Recruitment" colspan="4"/>
@@ -17,12 +19,14 @@
                     <newline/>
                     <field name="fetchmail_applicants"/>
                     <group colspan="2" attrs="{'invisible': [('fetchmail_applicants','=',False)]}">
-                        <field name="applicants_server"/>
-                        <field name="applicants_type" on_change="onchange_fetchmail('applicants', applicants_type, applicants_is_ssl)"/>
-                        <field name="applicants_port"/>						
-                        <field name="applicants_is_ssl" on_change="onchange_fetchmail('applicants', applicants_type, applicants_is_ssl)"/>
-                        <field name="applicants_user"/>
-                        <field name="applicants_password" password="True"/>						                  	
+                        <field name="applicants_server" attrs="{'required': [('fetchmail_applicants','=',True)]}"/>
+                        <field name="applicants_type" attrs="{'required': [('fetchmail_applicants','=',True)]}"
+                            on_change="onchange_fetchmail('applicants', applicants_type, applicants_is_ssl)"/>
+                        <field name="applicants_port" attrs="{'required': [('fetchmail_applicants','=',True)]}"/>
+                        <field name="applicants_is_ssl" attrs="{'required': [('fetchmail_applicants','=',True)]}"
+                            on_change="onchange_fetchmail('applicants', applicants_type, applicants_is_ssl)"/>
+                        <field name="applicants_user" attrs="{'required': [('fetchmail_applicants','=',True)]}"/>
+                        <field name="applicants_password" password="True" attrs="{'required': [('fetchmail_applicants','=',True)]}"/>
                     </group>	
                 </group>
             </field>
diff --git a/addons/hr_timesheet_sheet/res_config_view.xml b/addons/hr_timesheet_sheet/res_config_view.xml
index 72dd5b8d504..bd4142d7916 100644
--- a/addons/hr_timesheet_sheet/res_config_view.xml
+++ b/addons/hr_timesheet_sheet/res_config_view.xml
@@ -8,7 +8,10 @@
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
                 <field name="module_hr_timesheet_sheet" position="after">
-                    <button name="%(hr_timesheet.action_define_analytic_structure)d" string="Create Your Timesheet Accounts" type="action" icon="terp-folder-green"/>
+                    <group colspan="2">
+                        <button name="%(hr_timesheet.action_define_analytic_structure)d" string="Create Your Timesheet Accounts"
+                            type="action" icon="terp-folder-green"/>
+                    </group>
                 </field>
                 <group name="config_timesheets" position="after">
                     <separator string="Timesheets" colspan="4"/>