Merge pull request #133 from expsa/abuzar_task_hr

[FIX] fix bug in hr 005

odex25_hr/hr_holidays_community/models/hr_holidays.py

@@ -363,10 +363,19 @@ class Holidays(models.Model):
 
     def add_follower(self, employee_id):
         employee = self.env['hr.employee'].browse(employee_id)
+        partner_ids = []
+        
         if employee.user_id:
-            #print("...........................sdf")
-            self.message_subscribe(partner_ids=[employee.user_id.partner_id.id])
-            #print("...........................33333333")
+            partner_ids.append(employee.user_id.partner_id.id)
+        
+        if employee.parent_id and employee.parent_id.user_id:
+            partner_ids.append(employee.parent_id.user_id.partner_id.id)
+        
+        if employee.coach_id and employee.coach_id.user_id:
+            partner_ids.append(employee.coach_id.user_id.partner_id.id)
+        
+        if partner_ids:
+            self.message_subscribe(partner_ids=partner_ids)
 
     @api.model
     def create(self, values):

odex25_hr/hr_holidays_public/models/hr_holidays.py

@@ -1407,7 +1407,7 @@ class HRHolidays(models.Model):
         prev_holiday = self.search([('employee_id', '=', self.employee_id.id),
                                     ('holiday_status_id', '=', self.holiday_status_id.id),
                                     ('type', '=', 'remove'),
-                                    ('state', 'in', ('validate1', 'approved'))], limit=1, order="date_to desc")
+                                    ('state', 'not in', ('refuse'))], limit=1, order="date_to desc")
         if not prev_holiday: return
         if not self.date_from : return
         date_from, last_dt_to = fields.Date.from_string(self.date_from), fields.Date.from_string(prev_holiday.date_to)