[IMP] exp_official_mission: adjust approval process
This commit is contained in:
parent
893c1a269e
commit
59b4f60397
|
|
@ -30,9 +30,10 @@ class HrOfficialMission(models.Model):
|
|||
mission_purpose = fields.Text()
|
||||
state = fields.Selection([('draft', _('Draft')),
|
||||
('send', _('Waiting Direct Manager')),
|
||||
('accounting_manager', _('Waiting Accounting Manager')),
|
||||
('direct_manager', _('Waiting Department Manager')),
|
||||
('depart_manager', _('Wait HR Department')),
|
||||
('hr_aaproval', _('Wait Approval')),
|
||||
('accounting_manager_final', _('Waiting Accounting Manager')),
|
||||
('approve', _('Approved')),
|
||||
('refused', _('Refused'))], default="draft", tracking=True)
|
||||
duration_type = fields.Selection(default='days', related='mission_type.duration_type')
|
||||
|
|
@ -550,6 +551,12 @@ class HrOfficialMission(models.Model):
|
|||
self.state = "send"
|
||||
|
||||
def direct_manager(self):
|
||||
if self.mission_type.related_with_financial:
|
||||
self.state = 'accounting_manager'
|
||||
else:
|
||||
self.accounting_manager()
|
||||
|
||||
def accounting_manager(self):
|
||||
# self.chick_employee_ids()
|
||||
self.employee_ids.chick_not_overtime()
|
||||
self.employee_ids.compute_Training_cost_emp()
|
||||
|
|
@ -621,7 +628,10 @@ class HrOfficialMission(models.Model):
|
|||
|
||||
self.employee_ids.chick_not_overtime()
|
||||
self.employee_ids.compute_Training_cost_emp()
|
||||
self.state = "hr_aaproval"
|
||||
if self.mission_type.related_with_financial:
|
||||
self.state = "accounting_manager_final"
|
||||
else:
|
||||
self.approve()
|
||||
|
||||
def get_ticket_cost(self, employee):
|
||||
for rec in self:
|
||||
|
|
|
|||
|
|
@ -27,7 +27,8 @@
|
|||
states="send" groups="hr_base.group_division_manager"/>
|
||||
<button name="direct_manager_refused" string="Refused" class="oe_highlight" type="object"
|
||||
states="send" groups="hr_base.group_division_manager"/>
|
||||
|
||||
<button name="accounting_manager" string="Accounting Manager Approve" 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"
|
||||
states="direct_manager" groups="hr_base.group_department_manager"/>
|
||||
<button name="dep_manager_refused" string="Refused" class="oe_highlight" type="object"
|
||||
|
|
@ -40,11 +41,11 @@
|
|||
states="depart_manager"
|
||||
groups="hr_base.group_general_manager,hr_base.group_executive_manager"/>
|
||||
|
||||
<button name="approve" string="HR Approve" class="oe_highlight" type="object"
|
||||
states="hr_aaproval" groups="hr.group_hr_user"/>
|
||||
<button name="approve" string="Accounting Manager Final Approve" class="oe_highlight" type="object"
|
||||
states="accounting_manager_final" groups="hr_base.group_account_manager"/>
|
||||
<button name="refused" string="Refused" class="oe_highlight" type="object"
|
||||
states="hr_aaproval"
|
||||
groups="hr_base.group_general_manager,hr_base.group_executive_manager"/>
|
||||
states="accounting_manager_final"
|
||||
groups="hr_base.group_general_manager,hr_base.group_executive_manager,hr_base.group_account_manager"/>
|
||||
|
||||
<button name="draft_state" string="RE-Draft" class="oe_highlight" type="object"
|
||||
states="approve,refused" groups="hr.group_hr_user"
|
||||
|
|
|
|||
Loading…
Reference in New Issue