From fd9fcd3ac77229ccf7e0d391ada83975860a4910 Mon Sep 17 00:00:00 2001
From: skh <skh@tinyerp.com>
Date: Wed, 6 Apr 2011 12:27:36 +0530
Subject: [PATCH 1/6] [FIX] [PS] List view of leaves type contains different
 fields as the form view

lp bug: https://launchpad.net/bugs/751299 fixed

bzr revid: skh@tinyerp.com-20110406065736-944f5id53aesdf8b
---
 addons/hr_holidays/hr_holidays_view.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 7740470ccc7..2eb58504275 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -361,6 +361,12 @@
                     </group>
                     <notebook colspan="4">
                       <page string="Details">
+                          <group colspan="4" col="4" name="statistics">
+                              <separator string="Leave Status" colspan="4"/>
+                              <field name="max_leaves"/>
+                              <field name="leaves_taken"/>
+                              <field name="remaining_leaves"/>
+                          </group>                          
                           <group colspan="2" col="2" name="selection">
                               <separator string="Validation" colspan="2"/>
                               <field name="double_validation"/>

From a45a076aba0842e838bb1368d1c0d930ee406f0f Mon Sep 17 00:00:00 2001
From: skh <skh@tinyerp.com>
Date: Wed, 6 Apr 2011 12:55:20 +0530
Subject: [PATCH 2/6] [FIX] [PS] List view of leaves type contains different
 fields as the form view

lp bug: https://launchpad.net/bugs/751299 fixed

bzr revid: skh@tinyerp.com-20110406072520-vd8qj7iphmzkry3r
---
 addons/hr_holidays/hr_holidays_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 2eb58504275..3de7a254f01 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -361,7 +361,7 @@
                     </group>
                     <notebook colspan="4">
                       <page string="Details">
-                          <group colspan="4" col="4" name="statistics">
+                          <group colspan="4" col="4">
                               <separator string="Leave Status" colspan="4"/>
                               <field name="max_leaves"/>
                               <field name="leaves_taken"/>

From 0f3d174ff241cd624cadef577918927cb939469f Mon Sep 17 00:00:00 2001
From: skh <skh@tinyerp.com>
Date: Wed, 6 Apr 2011 15:29:19 +0530
Subject: [PATCH 3/6] [FIX] [PS] List view of leaves type contains different
 fields as the form view

lp bug: https://launchpad.net/bugs/751299 fixed

bzr revid: skh@tinyerp.com-20110406095919-rsp0rzugqglp901b
---
 addons/hr_holidays/hr_holidays_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 3de7a254f01..3f3a79c45cd 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -361,8 +361,8 @@
                     </group>
                     <notebook colspan="4">
                       <page string="Details">
-                          <group colspan="4" col="4">
-                              <separator string="Leave Status" colspan="4"/>
+                          <group colspan="2" col="2">
+                              <separator string="Leave Status" colspan="2"/>
                               <field name="max_leaves"/>
                               <field name="leaves_taken"/>
                               <field name="remaining_leaves"/>

From 309493382d2105996982acaffa524255be1cb421 Mon Sep 17 00:00:00 2001
From: skh <skh@tinyerp.com>
Date: Thu, 21 Apr 2011 12:09:36 +0530
Subject: [PATCH 4/6] [FIX] [PS] List view of leaves type contains different
 fields as the form view

lp bug: https://launchpad.net/bugs/751299 fixed

bzr revid: skh@tinyerp.com-20110421063936-a2k70vufxdvt3efm
---
 addons/hr_holidays/hr_holidays_view.xml | 28 +++++++++++++++----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 3f3a79c45cd..1fb5ac5e7ae 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -361,12 +361,6 @@
                     </group>
                     <notebook colspan="4">
                       <page string="Details">
-                          <group colspan="2" col="2">
-                              <separator string="Leave Status" colspan="2"/>
-                              <field name="max_leaves"/>
-                              <field name="leaves_taken"/>
-                              <field name="remaining_leaves"/>
-                          </group>                          
                           <group colspan="2" col="2" name="selection">
                               <separator string="Validation" colspan="2"/>
                               <field name="double_validation"/>
@@ -396,7 +390,19 @@
                 </tree>
             </field>
         </record>
-
+        <record model="ir.ui.view" id="view_holiday_leave_type_tree">
+            <field name="name">hr.holidays.status.leave.type.tree</field>
+            <field name="model">hr.holidays.status</field>
+            <field name="type">tree</field>
+            <field name="sequence" eval="40"/>
+            <field name="arch" type="xml">
+                <tree string="Leave Type">
+                    <field name="name"/>
+                    <field name="limit" />
+                </tree>
+            </field>
+        </record>
+        
         <record id="view_hr_holidays_status_search" model="ir.ui.view">
             <field name="name">hr.holidays.status.search</field>
             <field name="model">hr.holidays.status</field>
@@ -408,19 +414,19 @@
                 </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>
             <field name="res_model">hr.holidays.status</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="view_id" eval="view_holiday_status_tree"/>
+            <field name="view_id" eval="view_holiday_leave_type_tree"/>
             <field name="search_view_id" ref="view_hr_holidays_status_search"/>
         </record>
-
+        
         <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves"/>
-
+        
         <menuitem name="Leave Type"
             action="open_view_holiday_status"
             id="menu_open_view_holiday_status"

From 8b2d082ff9ed1203216f040a9af423755aebe874 Mon Sep 17 00:00:00 2001
From: skh <skh@tinyerp.com>
Date: Thu, 21 Apr 2011 12:50:31 +0530
Subject: [PATCH 5/6] [FIX] [PS] List view of leaves type contains different
 fields as the form view

lp bug: https://launchpad.net/bugs/751299 fixed

bzr revid: skh@tinyerp.com-20110421072031-r6l3uxk91bewcfrk
---
 addons/hr_holidays/hr_holidays_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 1fb5ac5e7ae..25d0deff9a4 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -394,7 +394,7 @@
             <field name="name">hr.holidays.status.leave.type.tree</field>
             <field name="model">hr.holidays.status</field>
             <field name="type">tree</field>
-            <field name="sequence" eval="40"/>
+            <field name="priority">10</field>
             <field name="arch" type="xml">
                 <tree string="Leave Type">
                     <field name="name"/>

From c6cc93fcb0a3987c47d87038dbda6fdeff9da97f Mon Sep 17 00:00:00 2001
From: skh <skh@tinyerp.com>
Date: Thu, 21 Apr 2011 17:42:26 +0530
Subject: [PATCH 6/6] [FIX] [PS] List view of leaves type contains different
 fields as the form view

lp bug: https://launchpad.net/bugs/751299 fixed

bzr revid: skh@tinyerp.com-20110421121226-40h4sahiuoydnjgt
---
 addons/hr_holidays/hr_holidays_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 25d0deff9a4..7ba9df629f3 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -390,8 +390,8 @@
                 </tree>
             </field>
         </record>
-        <record model="ir.ui.view" id="view_holiday_leave_type_tree">
-            <field name="name">hr.holidays.status.leave.type.tree</field>
+        <record model="ir.ui.view" id="view_holiday_status_normal_tree">
+            <field name="name">hr.holidays.status.normal.tree</field>
             <field name="model">hr.holidays.status</field>
             <field name="type">tree</field>
             <field name="priority">10</field>
@@ -421,7 +421,7 @@
             <field name="res_model">hr.holidays.status</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="view_id" eval="view_holiday_leave_type_tree"/>
+            <field name="view_id" eval="view_holiday_status_normal_tree"/>
             <field name="search_view_id" ref="view_hr_holidays_status_search"/>
         </record>