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-07-18 16:34:49 +03:00
parent 4852a9806d
commit bed3d96bed
7 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2518,19 +2518,6 @@ msgstr "السبب"
msgid "Receiving driving License :" msgid "Receiving driving License :"
msgstr "استلام رخصة القيادة:" msgstr "استلام رخصة القيادة:"
#. module: employee_requests
#: code:addons/employee_requests/models/hr_clearance_form.py:0
#: code:addons/employee_requests/models/hr_clearance_form.py:0
#: code:addons/employee_requests/models/hr_clearance_form.py:0
#: code:addons/employee_requests/models/hr_clearance_form.py:0
#: code:addons/employee_requests/models/hr_clearance_form.py:0
#: code:addons/employee_requests/models/other_request.py:0
#: model_terms:ir.ui.view,arch_db:employee_requests.employee_clearance_form_form_view
#: model_terms:ir.ui.view,arch_db:employee_requests.employee_other_request_form_view
#, python-format
msgid "Refuse"
msgstr "مرفوض"
#. module: employee_requests #. module: employee_requests
#: model:ir.model.fields,field_description:employee_requests.field_hr_personal_permission__refuse_cause #: model:ir.model.fields,field_description:employee_requests.field_hr_personal_permission__refuse_cause
msgid "Refuse Cause" msgid "Refuse Cause"
@ -2539,17 +2526,24 @@ msgstr "سبب الرفض"
#. module: employee_requests #. module: employee_requests
#: code:addons/employee_requests/models/employee_department_jobs.py:0 #: code:addons/employee_requests/models/employee_department_jobs.py:0
#: code:addons/employee_requests/models/employee_effective_form.py:0 #: code:addons/employee_requests/models/employee_effective_form.py:0
#: code:addons/employee_requests/models/employee_overtime_request.py:0
#: code:addons/employee_requests/models/house_allowance_advance.py:0 #: code:addons/employee_requests/models/house_allowance_advance.py:0
#: code:addons/employee_requests/models/hr_personal_permission.py:0
#: model_terms:ir.ui.view,arch_db:employee_requests.employee_department_jobs_form_view #: model_terms:ir.ui.view,arch_db:employee_requests.employee_department_jobs_form_view
#: model_terms:ir.ui.view,arch_db:employee_requests.employee_overtime_request_form_view
#: model_terms:ir.ui.view,arch_db:employee_requests.employee_personal_permission_form_view
#: model_terms:ir.ui.view,arch_db:employee_requests.employee_request_effective_form_view #: model_terms:ir.ui.view,arch_db:employee_requests.employee_request_effective_form_view
#, python-format #, python-format
msgid "Refused" msgid "Refused"
msgstr "مرفوض" msgstr "مرفوض"
#. module: employee_requests
#: code:addons/employee_requests/models/employee_overtime_request.py:0
#: code:addons/employee_requests/models/hr_personal_permission.py:0
#: model_terms:ir.ui.view,arch_db:employee_requests.employee_clearance_form_form_view
#: model_terms:ir.ui.view,arch_db:employee_requests.employee_other_request_form_view
#: model_terms:ir.ui.view,arch_db:employee_requests.employee_overtime_request_form_view
#: model_terms:ir.ui.view,arch_db:employee_requests.employee_personal_permission_form_view
#, python-format
msgid "Refuse"
msgstr "رفض"
#. module: employee_requests #. module: employee_requests
#: model:ir.model.fields,field_description:employee_requests.field_hr_personal_permission__refused_by #: model:ir.model.fields,field_description:employee_requests.field_hr_personal_permission__refused_by
msgid "Refused By" msgid "Refused By"
@ -3802,13 +3796,19 @@ msgid "Print Salary Confirmation"
msgstr "طباعة تثبيت الراتب" msgstr "طباعة تثبيت الراتب"
#. module: employee_requests #. module: employee_requests
#: code:addons/employee_requests/models/employee_overtime_request.py:0 #: code:addons/employee_requests/models/hr_personal_permission.py:0
#, python-format #, python-format
msgid "Sorry, The Approval For The Direct Manager %s Only OR HR Manager!" msgid "Sorry, The Approval For The Direct Manager '%s' Only OR HR Manager!"
msgstr "للأسف، لموافقة المدير المباشر %s فقط او مدير الموارد البشرية !" msgstr "للأسف، لموافقة المدير المباشر '%s' فقط او مدير الموارد البشرية !"
#. module: employee_requests #. module: employee_requests
#: code:addons/employee_requests/models/employee_overtime_request.py:0 #: code:addons/employee_requests/models/employee_overtime_request.py:0
#, python-format #, python-format
msgid "Sorry, The Approval For The Department Manager %s Only OR HR Manager!" msgid "Sorry, The Approval For The Direct Manager '%s' Only OR HR Manager!"
msgstr "للأسف، لموافقة مدير الإدارة %s فقط او مدير الموارد البشرية !" msgstr "للأسف، لموافقة المدير المباشر '%s' فقط او مدير الموارد البشرية !"
#. module: employee_requests
#: code:addons/employee_requests/models/employee_overtime_request.py:0
#, python-format
msgid "Sorry, The Approval For The Department Manager '%s' Only OR HR Manager!"
msgstr "للأسف، لموافقة مدير الإدارة '%s' فقط او مدير الموارد البشرية !"

8
odex25_hr/employee_requests/models/employee_overtime_request.py
View File

@ -150,10 +150,10 @@ class employee_overtime_request(models.Model):
#self.state = "direct_manager" #self.state = "direct_manager"
for rec in self: for rec in self:
if rec.employee_id.parent_id: if rec.employee_id.parent_id:
if rec.employee_id.parent_id.user_id.id == rec.env.uid or rec.env.company.hr_manager_id.user_id == rec.env.uid: if rec.employee_id.parent_id.user_id.id == rec.env.uid or rec.env.company.hr_manager_id.user_id.id == rec.env.uid:
rec.write({'state': 'direct_manager'}) rec.write({'state': 'direct_manager'})
else: else:
raise exceptions.Warning(_('Sorry, The Approval For The Direct Manager %s Only OR HR Manager!')%(rec.employee_id.parent_id.name)) raise exceptions.Warning(_("Sorry, The Approval For The Direct Manager '%s' Only OR HR Manager!")%(rec.employee_id.parent_id.name))
else: else:
rec.write({'state': 'direct_manager'}) rec.write({'state': 'direct_manager'})
@ -162,10 +162,10 @@ class employee_overtime_request(models.Model):
#self.state = "financial_manager" #self.state = "financial_manager"
for rec in self: for rec in self:
if rec.employee_id.coach_id: if rec.employee_id.coach_id:
if rec.employee_id.coach_id.user_id.id == rec.env.uid or rec.env.company.hr_manager_id.user_id == rec.env.uid: if rec.employee_id.coach_id.user_id.id == rec.env.uid or rec.env.company.hr_manager_id.user_id.id == rec.env.uid:
rec.write({'state': 'financial_manager'}) rec.write({'state': 'financial_manager'})
else: else:
raise exceptions.Warning(_('Sorry, The Approval For The Department Manager %s Only OR HR Manager!')%(rec.employee_id.coach_id.name)) raise exceptions.Warning(_("Sorry, The Approval For The Department Manager '%s' Only OR HR Manager!")%(rec.employee_id.coach_id.name))
else: else:
rec.write({'state': 'financial_manager'}) rec.write({'state': 'financial_manager'})

4
odex25_hr/employee_requests/models/hr_personal_permission.py
View File

@ -276,10 +276,10 @@ class HrPersonalPermission(models.Model):
#self.state = "direct_manager" #self.state = "direct_manager"
for rec in self: for rec in self:
if rec.employee_id.parent_id: if rec.employee_id.parent_id:
if rec.employee_id.parent_id.user_id == rec.env.uid or rec.env.company.hr_manager_id.user_id == rec.env.uid: if rec.employee_id.parent_id.user_id.id == rec.env.uid or rec.env.company.hr_manager_id.user_id.id == rec.env.uid:
rec.write({'state': 'direct_manager'}) rec.write({'state': 'direct_manager'})
else: else:
raise exceptions.Warning(_('Sorry, The Approval For The Direct Manager %s Only OR HR Manager!')%(rec.employee_id.parent_id.name)) raise exceptions.Warning(_("Sorry, The Approval For The Direct Manager '%s' Only OR HR Manager!")%(rec.employee_id.parent_id.name))
else: else:
rec.write({'state': 'direct_manager'}) rec.write({'state': 'direct_manager'})

10
odex25_hr/employee_requests/views/employee_overtime_request.xml
View File

@ -30,30 +30,30 @@
<button name="direct_manager" string="Direct Manager Approve" class="oe_highlight" type="object" <button name="direct_manager" string="Direct Manager Approve" class="oe_highlight" type="object"
states="submit" groups="hr_base.group_division_manager"/> states="submit" groups="hr_base.group_division_manager"/>
<button name="refused" string="Refused" class="oe_highlight" type="object" <button name="refused" string="Refuse" class="oe_highlight" type="object"
states="submit" groups="hr_base.group_division_manager"/> states="submit" groups="hr_base.group_division_manager"/>
<button name="financial_manager" string="Department Manager" class="oe_highlight" type="object" <button name="financial_manager" string="Department Manager" class="oe_highlight" type="object"
states="direct_manager" groups="hr_base.group_department_manager"/> states="direct_manager" groups="hr_base.group_department_manager"/>
<button name="refused" string="Refused" class="oe_highlight" type="object" <button name="refused" string="Refuse" class="oe_highlight" type="object"
states="direct_manager" groups="hr_base.group_department_manager"/> states="direct_manager" groups="hr_base.group_department_manager"/>
<button name="hr_aaproval" string="HR Approval" class="oe_highlight" type="object" <button name="hr_aaproval" string="HR Approval" class="oe_highlight" type="object"
states="financial_manager" groups="hr.group_hr_user, hr.group_hr_manager"/> states="financial_manager" groups="hr.group_hr_user, hr.group_hr_manager"/>
<button name="refused" string="Refused" class="oe_highlight" type="object" <button name="refused" string="Refuse" class="oe_highlight" type="object"
states="financial_manager" groups="hr.group_hr_user, hr.group_hr_manager"/> states="financial_manager" groups="hr.group_hr_user, hr.group_hr_manager"/>
<button name="executive_office" string="Executive Approval" class="oe_highlight" type="object" <button name="executive_office" string="Executive Approval" class="oe_highlight" type="object"
groups="hr_base.group_general_manager,hr_base.group_executive_manager" groups="hr_base.group_general_manager,hr_base.group_executive_manager"
attrs="{'invisible':['|',('state','!=','hr_aaproval'),('exception','!=',True)]}"/> attrs="{'invisible':['|',('state','!=','hr_aaproval'),('exception','!=',True)]}"/>
<button name="refused" string="Refused" class="oe_highlight" type="object" <button name="refused" string="Refuse" class="oe_highlight" type="object"
groups="hr_base.group_general_manager,hr_base.group_executive_manager" groups="hr_base.group_general_manager,hr_base.group_executive_manager"
attrs="{'invisible':['|',('state','!=','hr_aaproval'),('exception','!=',True)]}"/> attrs="{'invisible':['|',('state','!=','hr_aaproval'),('exception','!=',True)]}"/>
<button name="validated" string="Finance Approval" class="oe_highlight" type="object" <button name="validated" string="Finance Approval" class="oe_highlight" type="object"
groups="hr_base.group_account_manager" groups="hr_base.group_account_manager"
states="executive_office"/> states="executive_office"/>
<button name="refused" string="Refused" class="oe_highlight" type="object" <button name="refused" string="Refuse" class="oe_highlight" type="object"
states="executive_office" groups="hr_base.group_account_manager"/> states="executive_office" groups="hr_base.group_account_manager"/>
<button name="re_draft" string="RE-Draft" class="oe_highlight" type="object" <button name="re_draft" string="RE-Draft" class="oe_highlight" type="object"

4
odex25_hr/employee_requests/views/hr_personal_permission.xml
View File

@ -30,12 +30,12 @@
<button name="direct_manager" string="Direct Manager Approve" class="oe_highlight" type="object" <button name="direct_manager" string="Direct Manager Approve" class="oe_highlight" type="object"
states="send" groups="hr_base.group_division_manager"/> states="send" groups="hr_base.group_division_manager"/>
<button name="refused" string="Refused" class="oe_highlight" type="object" <button name="refused" string="Refuse" class="oe_highlight" type="object"
states="send" groups="hr_base.group_division_manager"/> states="send" groups="hr_base.group_division_manager"/>
<button name="approve" string="HR Approve" class="oe_highlight" type="object" <button name="approve" string="HR Approve" class="oe_highlight" type="object"
states="direct_manager" groups="hr.group_hr_user"/> states="direct_manager" groups="hr.group_hr_user"/>
<button name="refused" string="Refused" class="oe_highlight" type="object" <button name="refused" string="Refuse" class="oe_highlight" type="object"
states="direct_manager" groups="hr.group_hr_user"/> states="direct_manager" groups="hr.group_hr_user"/>
<button name="draft_state" string="RE-Draft" class="oe_highlight" type="object" <button name="draft_state" string="RE-Draft" class="oe_highlight" type="object"
states="approve" groups="hr.group_hr_user"/> states="approve" groups="hr.group_hr_user"/>

4
odex25_hr/hr_holidays_public/i18n/ar_001.po
View File

@ -3587,5 +3587,5 @@ msgstr ""
#. module: hr_holidays_public #. module: hr_holidays_public
#: code:addons/hr_holidays_public/models/hr_holidays.py:0 #: code:addons/hr_holidays_public/models/hr_holidays.py:0
#, python-format #, python-format
msgid "Sorry, The Approval For The Direct Manager %s Only OR HR Manager!" msgid "Sorry, The Approval For The Direct Manager '%s' Only OR HR Manager!"
msgstr "للأسف، لموافقة المدير المباشر %s فقط او مدير الموارد البشرية !" msgstr "للأسف، لموافقة المدير المباشر '%s' فقط او مدير الموارد البشرية !"

4
odex25_hr/hr_holidays_public/models/hr_holidays.py
View File

@ -984,10 +984,10 @@ class HRHolidays(models.Model):
#The Approval For The Direct Manager only #The Approval For The Direct Manager only
for rec in self: for rec in self:
if rec.employee_id.parent_id: if rec.employee_id.parent_id:
if rec.employee_id.parent_id.user_id.id == rec.env.uid or rec.env.company.hr_manager_id.user_id == rec.env.uid: if rec.employee_id.parent_id.user_id.id == rec.env.uid or rec.env.company.hr_manager_id.user_id.id == rec.env.uid:
rec.write({'state': 'direct_manager'}) rec.write({'state': 'direct_manager'})
else: else:
raise exceptions.Warning(_('Sorry, The Approval For The Direct Manager %s Only OR HR Manager!')%(rec.employee_id.parent_id.name)) raise exceptions.Warning(_("Sorry, The Approval For The Direct Manager '%s' Only OR HR Manager!")%(rec.employee_id.parent_id.name))
else: else:
rec.write({'state': 'direct_manager'}) rec.write({'state': 'direct_manager'})