From 7f08d3d17609c25da7bc31b942e14da5bf370f55 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Tue, 25 Sep 2012 23:03:20 +0530
Subject: [PATCH] [FIX]: Fix employee manager id

bzr revid: atp@tinyerp.com-20120925173320-z4vn1ir2bwp9gu5l
---
 addons/hr/hr_view.xml                           | 2 +-
 addons/hr_evaluation/hr_evaluation.py           | 2 +-
 addons/hr_expense/hr_expense.py                 | 4 ++--
 addons/hr_holidays/hr_holidays.py               | 2 +-
 addons/hr_timesheet_sheet/hr_timesheet_sheet.py | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 9924b75acea..f32171bcc00 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -44,7 +44,7 @@
                                         <field name="department_id" on_change="onchange_department_id(department_id)"/>
                                         <field name="job_id" options='{"no_open": true}' domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
                                         <field name="parent_id"/>
-                                        <span class="oe_grey" colspan="2">As Manager of this employee, you will automatically follow all human resource request of this employee</span>
+                                        <span class="oe_grey" colspan="2" attrs="{'invisible': [('parent_id', '=', False)]}">As Manager of this employee, you will automatically follow all human resource request of this employee</span>
                                         <field name="coach_id"/>
                                     </group>
                                     <group>
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index a40b21087f9..a81d1c9b9cb 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -245,7 +245,7 @@ class hr_evaluation(osv.osv):
         self.write(cr, uid, ids, {'state':'progress'}, context=context)
         for evaluation in self.browse(cr, uid, ids, context=context):
             if evaluation.employee_id and evaluation.employee_id.parent_id and evaluation.employee_id.parent_id.user_id:
-                self.message_subscribe(cr, uid, [evaluation.id], [evaluation.employee_id.parent_id.user_id.id], context=context)
+                self.message_subscribe_users(cr, uid, [evaluation.id], user_ids=[evaluation.employee_id.parent_id.user_id.id], context=context)
             if len(evaluation.survey_request_ids) != len(request_obj.search(cr, uid, [('evaluation_id', '=', evaluation.id),('state', 'in', ['done','cancel'])], context=context)):
                 raise osv.except_osv(_('Warning!'),_("You cannot change state, because some appraisal(s) are in waiting answer or draft state."))
         return True
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index f8fa8d9caff..91dc44fed61 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -119,8 +119,8 @@ class hr_expense_expense(osv.osv):
 
     def expense_confirm(self, cr, uid, ids, *args):
         for expense in self.browse(cr, uid, ids):
-            if expense.employee_id and expense.employee_id.parent_id and expense.employee_id.parent_id.user_id:
-                self.message_subscribe(cr, uid, [expense.id], [expense.employee_id.parent_id.user_id.id])
+            if expense.employee_id and expense.employee_id.parent_id.user_id:
+                self.message_subscribe_users(cr, uid, [expense.id], user_ids=[expense.employee_id.parent_id.user_id.id])
         self.write(cr, uid, ids, {
             'state':'confirm',
             'date_confirm': time.strftime('%Y-%m-%d')
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 770552b0573..76d4e42818a 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -303,7 +303,7 @@ class hr_holidays(osv.osv):
         self.check_holidays(cr, uid, ids, context=context)
         for record in self.browse(cr, uid, ids, context=context):
             if record.employee_id and record.employee_id.parent_id and record.employee_id.parent_id.user_id:
-                self.message_subscribe(cr, uid, [record.id], [record.employee_id.parent_id.user_id.id], context=context)
+                self.message_subscribe_users(cr, uid, [record.id], user_ids=[record.employee_id.parent_id.user_id.id], context=context)
         self.holidays_confirm_notificate(cr, uid, ids, context=context)
         return self.write(cr, uid, ids, {'state':'confirm'})
 
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 3e7d7127b51..13c11cf72c7 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -267,7 +267,7 @@ class hr_timesheet_sheet(osv.osv):
     def button_confirm(self, cr, uid, ids, context=None):
         for sheet in self.browse(cr, uid, ids, context=context):
             if sheet.employee_id and sheet.employee_id.parent_id and sheet.employee_id.parent_id.user_id:
-                self.message_subscribe(cr, uid, [sheet.id], [sheet.employee_id.parent_id.user_id.id], context=context)
+                self.message_subscribe_users(cr, uid, [sheet.id], user_ids=[sheet.employee_id.parent_id.user_id.id], context=context)
             self.check_employee_attendance_state(cr, uid, sheet.id, context=context)
             di = sheet.user_id.company_id.timesheet_max_difference
             if (abs(sheet.total_difference) < di) or not di: