devops_admin
/
odex25_standard
mirror of https://github.com/hydracp9/odex25_standard
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix

This commit is contained in:
Bakry 2024-10-07 13:45:43 +03:00
parent 5ec1e48aee
commit 153eee6011
3 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
odex25_hr/employee_requests/i18n/ar_001.po
View File

@ -3768,6 +3768,7 @@ msgstr "طباعة تثبيت الراتب"
#. module: employee_requests
#: code:addons/employee_requests/models/employee_overtime_request.py:0
#: code:addons/employee_requests/models/hr_personal_permission.py:0
#: code:addons/employee_requests/models/other_request.py:0
#, python-format
msgid "Sorry, The Approval For The Direct Manager '%s' Only OR HR Manager!"
msgstr "للأسف، لموافقة المدير المباشر '%s' فقط او مدير الموارد البشرية !"
@ -3781,6 +3782,7 @@ msgstr "للأسف، لموافقة مدير الإدارة '%s' فقط او م
#. module: hr_holidays_public
#: code:addons/employee_requests/models/employee_overtime_request.py:0
#: code:addons/employee_requests/models/hr_personal_permission.py:0
#: code:addons/employee_requests/models/other_request.py:0
#, python-format
msgid "Sorry, The Refuse For The Direct Manager '%s' Only OR HR Manager!"
msgstr "للأسف، لرفض المدير المباشر '%s' فقط او مدير الموارد البشرية !"

25
odex25_hr/employee_requests/models/other_request.py
View File

@ -120,7 +120,17 @@ class EmployeeOtherRequest(models.Model):
item.state = "submit"
def confirm(self):
self.state = 'confirm'
#self.state = 'confirm'
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': 'confirm'})
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': 'confirm'})
def approved(self):
for item in self:
@ -179,6 +189,19 @@ class EmployeeOtherRequest(models.Model):
self.state = 'refuse'
#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.refuse()
else:
raise exceptions.Warning(_("Sorry, The Refuse For The Direct Manager '%s' Only OR HR Manager!") % (manager.name))
else:
rec.refuse()
def draft(self):
for item in self:
if item.request_type == 'dependent':

2
odex25_hr/employee_requests/views/other_request.xml
View File

@ -35,7 +35,7 @@
<button name="confirm" string="Direct Manager Approve" class="oe_highlight" states="submit"
type="object" groups="hr_base.group_division_manager"/>
<button name="refuse" string="Refuse" class="oe_highlight" states="submit" type="object"
<button name="direct_manager_refused" string="Refuse" class="oe_highlight" states="submit" type="object"
groups="hr_base.group_division_manager"/>
<button name="approved" string="HR Approval" class="oe_highlight" states="confirm" type="object"