Merge pull request #1300 from expsa/bakry_hr

fix

odex25_hr/attendances/i18n/ar_001.po

@@ -2183,3 +2183,15 @@ msgstr "رقم الموظف"
 msgid "Branch"
 msgstr "الفروع"
 
+#. module: attendances
+#: code:addons/attendances/models/hr_attendance_register.py:0
+#, python-format
+msgid "Sorry, The Approval For The Direct Manager '%s' Only OR HR Manager!"
+msgstr "للأسف، لموافقة المدير المباشر '%s' فقط او مدير الموارد البشرية !"
+
+#. module: attendances
+#: code:addons/attendances/models/hr_attendance_register.py:0
+#, python-format
+msgid "Sorry, The Refuse For The Direct Manager '%s' Only OR HR Manager!"
+msgstr "للأسف، لرفض المدير المباشر '%s' فقط او مدير الموارد البشرية !"
+

odex25_hr/attendances/models/hr_attendance_register.py

@@ -77,7 +77,29 @@ class HrAttendanceRegister(models.Model):
         self.state = "send"
 
     def direct_manager(self):
-        self.state = "direct_manager"
+        for rec in self:
+            manager = rec.sudo().employee_id.parent_id
+            hr_manager = rec.sudo().employee_id.company_id.hr_manager_id
+            if manager:
+               if (manager.user_id.id == rec.env.uid or hr_manager.user_id.id == rec.env.uid):
+                    rec.write({'state': 'direct_manager'})
+               else:
+                   raise exceptions.Warning(_("Sorry, The Approval For The Direct Manager '%s' Only OR HR Manager!")%(rec.employee_id.parent_id.name))
+            else:
+                rec.write({'state': 'direct_manager'})
+
+    #Refuse For The Direct Manager
+    def direct_manager_refused(self):
+        for rec in self:
+            manager = rec.sudo().employee_id.parent_id
+            hr_manager = rec.sudo().employee_id.company_id.hr_manager_id
+            if manager:
+                if manager.user_id.id == rec.env.uid or hr_manager.user_id.id == rec.env.uid:
+                   rec.refused()
+                else:
+                    raise exceptions.Warning(_("Sorry, The Refuse For The Direct Manager '%s' Only OR HR Manager!") % (manager.name))
+            else:
+                 rec.refused()
 
     def hr_manager(self):
         extract_date = datetime.strptime(str(self.action_date), "%Y-%m-%d %H:%M:%S").date()

odex25_hr/attendances/models/hr_attendance_transactions.py

@@ -46,6 +46,7 @@ class HrAttendanceTransactions(models.Model):
                 rec.additional_hours = rec.office_hours - rec.plan_hours
                 # rec.carried_hours = rec.office_hours - rec.plan_hours
 
+    #@api.depends('employee_id')
     def get_hours(self):
         module = self.env['ir.module.module'].sudo()
         official_mission_module = module.search([('state', '=', 'installed'), ('name', '=', 'exp_official_mission')])

odex25_hr/attendances/views/hr_attendance_register_view.xml

@@ -38,7 +38,7 @@
 
                         <button name="direct_manager" string="Direct Manager" class="oe_highlight" type="object"
                                 states="send" groups="hr_base.group_division_manager"/>
-                        <button name="refused" string="Refused" class="oe_highlight" type="object"
+                        <button name="direct_manager_refused" string="Refused" class="oe_highlight" type="object"
                                 states="send" groups="hr_base.group_division_manager"/>
 
                         <button name="hr_manager" string="HR Manager" class="oe_highlight" type="object"