From eb38ea17a7b69f488e4db894d19b3c298f6155a0 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Sat, 16 Oct 2010 13:06:10 +0530
Subject: [PATCH] [MOD/IMP]hr_* :Usability Improvement in view

bzr revid: dbr@tinyerp.com-20101016073610-e6usev1z24timua6
---
 addons/hr_holidays/hr_holidays_view.xml | 30 ++++++++++++++++++++----
 addons/hr_payroll/hr_payroll_view.xml   | 31 ++++++++++++++-----------
 2 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 0d78af87975..cc0ee951638 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -359,10 +359,18 @@
                         <field name="color_name"/>
                         <field name="categ_id" widget="selection" groups="base.group_extended"/>
                         <newline/>
-                        <field name="limit"/>
-                        <field name="double_validation"/>
-                        <field name="active"/>
-                    </group>
+					</group>
+					<notebook colspan="4">
+					  <page string="Details">
+						<group name="selection" col="2" colspan="2">
+							<field name="active"/>
+							<newline/>
+							<field name="double_validation" />
+							<newline/>
+							<field name="limit" />
+						</group>
+					  </page>
+					</notebook>
                 </form>
             </field>
         </record>
@@ -379,7 +387,19 @@
                 </tree>
             </field>
         </record>
-
+		<record id="view_hr_holidays_filter" model="ir.ui.view">
+            <field name="name">hr.holidays.status.filter</field>
+            <field name="model">hr.holidays.status</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Leave Type">
+                    <group col='8' colspan='4'>
+                        <field name="name" selection="1"/>
+                        <field name="limit"/>
+                    </group>
+                </search>
+            </field>
+        </record>
         <record id="open_view_holiday_status" model="ir.actions.act_window">
             <field name="name">Leave Type</field>
             <field name="type">ir.actions.act_window</field>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 8c4fe100099..3eec88ef26c 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -402,20 +402,23 @@
             <field name="inherit_id" ref="hr_holidays.edit_holiday_status_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <field name="double_validation" position="replace">
-                    <group col="2" colspan="2">
-                        <separator colspan="4" string="Payroll Configurtion"/>
-                        <field name="type"/>
-                        <field name="head_id"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection" select="2"/>
-                        <field name="code" readonly="True"/>
-                    </group>
-                    <group col="2" colspan="2">
-                        <separator colspan="4" string="Validation"/>
-                        <field name="double_validation"/>
-                    </group>
-                </field>
-            </field>
+            <xpath expr="//group[@name='selection']" position="replace">
+				<group col="1">
+		          	<separator colspan="2" string="Validation"/>
+					<newline/>
+					<field name="active"/>
+					<field name="limit"/>
+					<field name="double_validation"/>
+			  	</group>
+				<group col="2">						
+					<separator colspan="2" string="Payroll Configurtion"/>
+					<field name="type"/>
+					<field name="head_id"/>
+					<field name="company_id" groups="base.group_multi_company" widget="selection" select="2"/>
+					<field name="code" readonly="True"/>
+				</group>
+			</xpath>
+        </field>
         </record>
         <!-- End Holiday Status -->