diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index 83ce130e360..3f0cd36ce4e 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -61,7 +61,7 @@
         'wizard/hr_holidays_summary_employees_view.xml',
         #'process/hr_holidays_process.xml'
     ],
-    'demo_xml': [],
+    'demo_xml': ['hr_holidays_demo.xml',],
     'installable': True,
     'active': False,
     'certificate': '0086579209325',
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index b8543d8a407..677157d316e 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -23,7 +23,6 @@
 import time
 import datetime
 
-import pooler
 import netsvc
 from osv import fields, osv
 from tools.translate import _
diff --git a/addons/hr_holidays/hr_holidays_demo.xml b/addons/hr_holidays/hr_holidays_demo.xml
index 5e9f8cfae07..c5948b437f8 100644
--- a/addons/hr_holidays/hr_holidays_demo.xml
+++ b/addons/hr_holidays/hr_holidays_demo.xml
@@ -5,34 +5,31 @@
 		<!-- Casual leave -->
 		<record model="hr.holidays.status" id="holiday_status_cl">
 			<field name="name">Casual Leave</field>
-			<field name="color_name">red</field>
-		</record>
-
-		<record model="hr.holidays.per.user" id="holiday_user_employee1_cl">
-			<field name="employee_id" ref="hr.employee1"/>
-			<field name="holiday_status" ref="holiday_status_cl"/>
-			<field name="max_leaves">12</field>
+			<field name="color_name">black</field>
 		</record>
 
 		<record model="hr.holidays" id="hr_holidays_employee1_cl">
 			<field name="name">Going For Tour</field>
 			<field name="holiday_status_id" ref="holiday_status_cl"/>
 			<field name="date_from">2010-01-01 08:00</field>
-			<field name="date_to">2010-01-03 18:00</field>
-			<field name="number_of_days_temp">3</field>
+			<field name="date_to">2010-01-01 18:00</field>
+			<field name="number_of_days_temp">1</field>
 			<field name="employee_id" ref="hr.employee1"/>
 		</record>
 
+        <record model="hr.holidays" id="hr_holidays_employee1_cl1">
+            <field name="name">Family Function</field>
+            <field name="holiday_status_id" ref="holiday_status_cl"/>
+            <field name="date_from">2010-03-10 08:00</field>
+            <field name="date_to">2010-03-14 18:00</field>
+            <field name="number_of_days_temp">5</field>
+            <field name="employee_id" ref="hr.employee1"/>
+        </record>
+
 		<!-- Sick leave -->
 		<record model="hr.holidays.status" id="holiday_status_sl">
-			<field name="name">Sickness Leave</field>
-			<field name="color_name">black</field>
-		</record>
-
-		<record model="hr.holidays.per.user" id="holiday_user_employee1_sl">
-			<field name="employee_id" ref="hr.employee1"/>
-			<field name="holiday_status" ref="holiday_status_sl"/>
-			<field name="max_leaves">6</field>
+			<field name="name">Sick Leave</field>
+			<field name="color_name">red</field>
 		</record>
 
 		<record model="hr.holidays" id="hr_holidays_employee1_sl">
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 9a3a8921a70..062e0f500a2 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -13,7 +13,7 @@
                         <filter icon="terp-hr" domain="[('state','=','validate')]" string="Validated"
                             default="context.get('report', False)"/>
                         <separator orientation="vertical"/>
-                        <field name="user_id" widget="selection" default="uid"/>
+                        <field name="user_id" widget="selection"/>
                         <field name="department_id" widget="selection">
                             <filter icon="terp-hr"
                                 domain="[('department_id.manager_id','=',uid)]"
@@ -230,6 +230,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="edit_holiday_new"/>
             <field name="domain">[('type','=','remove')]</field>
+            <field name="context">{'search_default_user_id':uid}</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
 
@@ -248,20 +249,21 @@
     </record>
 
 
-       <menuitem
-          name="Leave Requests"
-            parent="menu_open_ask_holidays"
-            id="menu_open_ask_holidays_new"
-            action="open_ask_holidays"/>
+    <menuitem
+       name="Leave Requests"
+         parent="menu_open_ask_holidays"
+         id="menu_open_ask_holidays_new"
+         action="open_ask_holidays"/>
 
-        <record model="ir.actions.act_window" id="open_allocation_holidays">
-            <field name="name">Allocation Requests</field>
-            <field name="res_model">hr.holidays</field>
-            <field name="view_type">form</field>
-            <field name="context">{'type':'add'}</field>
-            <field name="domain">[('type','=','add')]</field>
-            <field name="view_id" ref="allocation_leave_new" />
-        </record>
+	<record model="ir.actions.act_window" id="open_allocation_holidays">
+	    <field name="name">Allocation Requests</field>
+	    <field name="res_model">hr.holidays</field>
+	    <field name="view_type">form</field>
+	    <field name="context">{'search_default_user_id':uid,'type':'add'}</field>
+	    <field name="domain">[('type','=','add')]</field>
+	    <field name="view_id" ref="allocation_leave_new"/>
+	    <field name="search_view_id" ref="view_hr_holidays_filter"/>
+	</record>
 
     <record model="ir.actions.act_window.view" id="action_open_allocation_holidays_tree">
         <field name="sequence" eval="1"/>
@@ -288,8 +290,9 @@
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="view_id" eval="view_holiday_simple" />
-            <field name="context">{'allocation_type':'company', 'report':True}</field>
+            <field name="view_id" eval="view_holiday_simple"/>
+            <field name="context">{'search_default_user_id':uid,'allocation_type':'company', 'report':True}</field>
+            <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
 
         <menuitem