From 23168a11f5c2c370765645981b95846c80c9cde1 Mon Sep 17 00:00:00 2001
From: Saurang Suthar <ssu@tinyerp.com>
Date: Mon, 3 Sep 2012 11:05:07 +0530
Subject: [PATCH 1/5] [IMP]hr_holidays:made fields hpliday_type, employee_id
 visible only for HR/Officers and remove red color of Refuse button

bzr revid: ssu@tinyerp.com-20120903053507-ghwwdvd1ag92f9lm
---
 addons/hr_holidays/hr_holidays_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 711d07bbfe8..8506d22a55d 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -94,7 +94,7 @@
                     <button string="Submit to Manager" name="confirm" states="draft" type="workflow" class="oe_highlight"/>
                     <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
-                    <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user,base.group_hr_manager" class="oe_highlight"/>
+                    <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user,base.group_hr_manager"/>
                     <button string="Reset to New" name="set_to_draft" states="refuse,validate" type="object" groups="base.group_hr_user" />
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                 </header>
@@ -153,7 +153,7 @@
                     <button string="Submit to Manager" name="confirm" states="draft" type="workflow" class="oe_highlight"/>
                     <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
-                    <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
+                    <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user"/>
                     <button string="Reset to New" name="set_to_draft" states="cancel,validate,refuse" type="object" groups="base.group_hr_user" />
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                 </header>
@@ -161,8 +161,8 @@
                     <group>
                         <group>
                             <field name="name"/>
-                            <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Mode" groups="base.group_hr_manager"/>
-                            <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')], 'invisible':[('holiday_type','=','category')]}"/>
+                            <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Mode" groups="base.group_hr_user"/>
+                            <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')], 'invisible':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
                             <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')], 'invisible':[('holiday_type','=','employee')]}"/>
                             <field name="department_id" attrs="{'readonly':['|', ('holiday_type','=','category'), ('state','not in' ,('draft', 'confirm'))]}"/>
                         </group>

From f1ac51cb218c18360c68f1df9511a4c77901bda0 Mon Sep 17 00:00:00 2001
From: Saurang Suthar <ssu@tinyerp.com>
Date: Wed, 12 Sep 2012 12:40:31 +0530
Subject: [PATCH 2/5] [IMP]hr_holidays:made fields holiday_type and employee_id
 visible only for HR/Officer

bzr revid: ssu@tinyerp.com-20120912071031-fopmip7rp06ymqmr
---
 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 958c2cab062..8bd00d58832 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -149,8 +149,8 @@
                             <field name="number_of_days_temp"/>
                         </group>
                         <group>
-                            <field name="holiday_type" on_change="onchange_type(holiday_type)"/>
-                            <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')], 'invisible':[('holiday_type','=','category')]}"/>
+                            <field name="holiday_type" on_change="onchange_type(holiday_type)" groups="base.group_hr_user"/>
+                            <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')], 'invisible':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
                             <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'invisible':[('holiday_type','=','employee')]}"/>
                             <field name="department_id" attrs="{'invisible':[('holiday_type','=','category')]}"/>
                         </group>

From c669824898ad0bd597c8addc5ae11c3c38e73c79 Mon Sep 17 00:00:00 2001
From: Saurang Suthar <ssu@tinyerp.com>
Date: Wed, 12 Sep 2012 14:58:57 +0530
Subject: [PATCH 3/5] [IMP]:improved code for opening employee form view while
 clicking on Hire button and employee list view while selecting Categories
 Structure

bzr revid: ssu@tinyerp.com-20120912092857-q7j1qje1p6q0dr2f
---
 addons/hr/hr_view.xml                   | 2 +-
 addons/hr_holidays/hr_holidays_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 00ed2afbef2..5d4c2ae9d45 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -180,7 +180,7 @@
             <field name="name">Employees</field>
             <field name="res_model">hr.employee</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">form,tree</field>
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_employee_filter"/>
         </record>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 8bd00d58832..e1f18236d35 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -482,7 +482,7 @@
 
         <record id="hr_holidays_leaves_assign_tree_view" model="ir.ui.view">
             <field name="name">hr.employee.leave.tree</field>
-            <field name="model">hr.employee</field>
+            <field name="model">hr.holidays.status</field>
             <field name="arch" type="xml">
                 <tree string="Assign Leaves" editable="bottom">
                     <field name="name" string="Employee"/>

From 4a14de9e0b2fb5a6d2fd9f10f6ea3dc48dbbc0d0 Mon Sep 17 00:00:00 2001
From: Amit Patel <apa@tinyerp.com>
Date: Mon, 17 Sep 2012 11:57:03 +0530
Subject: [PATCH 4/5] [IMP]:hr fix

bzr revid: apa@tinyerp.com-20120917062703-vi4geb7l1q9n40zc
---
 addons/hr_holidays/hr_holidays_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 8bd00d58832..084a8cc7412 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -483,6 +483,7 @@
         <record id="hr_holidays_leaves_assign_tree_view" model="ir.ui.view">
             <field name="name">hr.employee.leave.tree</field>
             <field name="model">hr.employee</field>
+            <field name="sequence">20</field>
             <field name="arch" type="xml">
                 <tree string="Assign Leaves" editable="bottom">
                     <field name="name" string="Employee"/>

From 3fa4a257fc6c23bc282a87871994303d57f071a0 Mon Sep 17 00:00:00 2001
From: Amit Patel <apa@tinyerp.com>
Date: Mon, 17 Sep 2012 12:57:12 +0530
Subject: [PATCH 5/5] [IMP]:improved view priority

bzr revid: apa@tinyerp.com-20120917072712-7sn4h0rf9boiqint
---
 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 084a8cc7412..76a7de47624 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -483,7 +483,7 @@
         <record id="hr_holidays_leaves_assign_tree_view" model="ir.ui.view">
             <field name="name">hr.employee.leave.tree</field>
             <field name="model">hr.employee</field>
-            <field name="sequence">20</field>
+            <field name="priority" eval="20"/>
             <field name="arch" type="xml">
                 <tree string="Assign Leaves" editable="bottom">
                     <field name="name" string="Employee"/>