Merge pull request #5136 from expsa/JAZ-3842

[IMP] exp_official_mission: adjust approval process
This commit is contained in:
abdurrahman-saber 2025-11-01 12:55:54 +02:00 committed by GitHub
commit b85935c87d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 3 deletions

View File

@ -571,6 +571,10 @@ class HrOfficialMission(models.Model):
if self.mission_type.approve_by == 'direct_manager': if self.mission_type.approve_by == 'direct_manager':
self.approve() self.approve()
def accounting_manager_refused(self):
for rec in self:
rec.refused()
# Refuse For The Direct Manager Only # Refuse For The Direct Manager Only
def direct_manager_refused(self): def direct_manager_refused(self):
for rec in self: for rec in self:

View File

@ -28,7 +28,7 @@
<field name="name">Allow HR : views missions of all employees</field> <field name="name">Allow HR : views missions of all employees</field>
<field name="model_id" ref="model_hr_official_mission"/> <field name="model_id" ref="model_hr_official_mission"/>
<field name="domain_force">[(1 ,'=', 1)]</field> <field name="domain_force">[(1 ,'=', 1)]</field>
<field name="groups" eval="[(3, ref('hr_base.group_account_manager')), <field name="groups" eval="[(4, ref('hr_base.group_account_manager')),
(4, ref('hr_base.group_executive_manager')), (4, ref('hr_base.group_executive_manager')),
(4, ref('hr_base.group_general_manager')), (4, ref('hr_base.group_general_manager')),
(4, ref('exp_hr_appraisal.group_appraisal_manager')), (4, ref('exp_hr_appraisal.group_appraisal_manager')),
@ -76,7 +76,7 @@
<field name="name">Allow HR : views missions of all employees</field> <field name="name">Allow HR : views missions of all employees</field>
<field name="model_id" ref="model_hr_official_mission_employee"/> <field name="model_id" ref="model_hr_official_mission_employee"/>
<field name="domain_force">[(1 ,'=', 1)]</field> <field name="domain_force">[(1 ,'=', 1)]</field>
<field name="groups" eval="[(3, ref('hr_base.group_account_manager')), <field name="groups" eval="[(4, ref('hr_base.group_account_manager')),
(4, ref('hr_base.group_executive_manager')), (4, ref('hr_base.group_executive_manager')),
(4, ref('hr_base.group_general_manager')), (4, ref('hr_base.group_general_manager')),
(4, ref('hr.group_hr_manager')), (4, ref('hr.group_hr_manager')),

View File

@ -29,6 +29,9 @@
states="send" groups="hr_base.group_division_manager"/> states="send" groups="hr_base.group_division_manager"/>
<button name="accounting_manager" string="Accounting Manager Approve" class="oe_highlight" type="object" <button name="accounting_manager" string="Accounting Manager Approve" class="oe_highlight" type="object"
states="accounting_manager" groups="hr_base.group_account_manager"/> states="accounting_manager" groups="hr_base.group_account_manager"/>
<button name="accounting_manager_refused" string="Refused" class="oe_highlight" type="object"
states="accounting_manager"
groups="hr_base.group_account_manager"/>
<button name="depart_manager" string="Department Manager" class="oe_highlight" type="object" <button name="depart_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="dep_manager_refused" string="Refused" class="oe_highlight" type="object" <button name="dep_manager_refused" string="Refused" class="oe_highlight" type="object"
@ -45,7 +48,7 @@
states="accounting_manager_final" groups="hr_base.group_account_manager"/> states="accounting_manager_final" groups="hr_base.group_account_manager"/>
<button name="refused" string="Refused" class="oe_highlight" type="object" <button name="refused" string="Refused" class="oe_highlight" type="object"
states="accounting_manager_final" states="accounting_manager_final"
groups="hr_base.group_general_manager,hr_base.group_executive_manager,hr_base.group_account_manager"/> groups="hr_base.group_account_manager"/>
<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,refused" groups="hr.group_hr_user" states="approve,refused" groups="hr.group_hr_user"