[FIX][ADD][IMP] hr_holidays: fixed the used 'category_ids'(M2M) field of...

[FIX][ADD][IMP] hr_holidays: fixed the used 'category_ids'(M2M) field of employee, Added calendar view of Leave Request Object, Improved the menu string.

bzr revid: vra@tinyerp.com-20100812072802-89kthus9a1ewqbop

addons/hr_holidays/hr_holidays.py

@@ -327,7 +327,7 @@ class hr_holidays(osv.osv):
                      }
                 self._create_resource_leave(cr, uid, vals)
             elif record.holiday_type == 'category' and record.type == 'remove':
-                emp_ids = obj_emp.search(cr, uid, [('category_id', '=', record.category_id.id)])
+                emp_ids = obj_emp.search(cr, uid, [('category_ids', '=', record.category_id.id)])
                 for emp in obj_emp.browse(cr, uid, emp_ids):
                     vals = {
                        'name': record.name,

addons/hr_holidays/hr_holidays_view.xml

@@ -36,6 +36,18 @@
         </record>
 
         <!-- Holidays: Leave Request -->
+        
+        <record id="view_holiday_new_calendar" model="ir.ui.view">
+            <field name="name">Leave Request</field>
+            <field name="model">hr.holidays</field>
+            <field name="type">calendar</field>
+            <field name="arch" type="xml">
+                <calendar string="Leave Request" color="name" date_start="date_from" date_stop="date_to">
+                	<field name="holiday_status_id"/>
+                </calendar>
+            </field>
+        </record>
+    
         <record model="ir.ui.view" id="edit_holiday_new">
             <field name="name">Leave Request</field>
             <field name="model">hr.holidays</field>
@@ -272,6 +284,13 @@
             <field name="act_window_id" ref="open_ask_holidays"/>
         </record>
 
+        <record model="ir.actions.act_window.view" id="action_open_ask_holidays_calendar">
+            <field name="sequence" eval="3"/>
+            <field name="view_mode">calendar</field>
+            <field name="view_id" ref="view_holiday_new_calendar"/>
+            <field name="act_window_id" ref="open_ask_holidays"/>
+        </record>
+
         <menuitem name="Leave Requests" parent="menu_open_ask_holidays" id="menu_open_ask_holidays_new"
              action="open_ask_holidays"/>
 
@@ -358,7 +377,7 @@
         </record>
 
         <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves" groups="base.group_system"/>
-        <menuitem name="Leave Status"
+        <menuitem name="Leave Type"
             action="open_view_holiday_status"
             id="menu_open_view_holiday_status"
             parent="hr.menu_open_view_attendance_reason_config"/>