diff --git a/odex25_hr/exp_official_mission/models/hr_official_mission.py b/odex25_hr/exp_official_mission/models/hr_official_mission.py
index b5fbf321b..3a717a8aa 100644
--- a/odex25_hr/exp_official_mission/models/hr_official_mission.py
+++ b/odex25_hr/exp_official_mission/models/hr_official_mission.py
@@ -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:
diff --git a/odex25_hr/exp_official_mission/views/hr_official_mission.xml b/odex25_hr/exp_official_mission/views/hr_official_mission.xml
index 7550fdaa7..6e5813677 100644
--- a/odex25_hr/exp_official_mission/views/hr_official_mission.xml
+++ b/odex25_hr/exp_official_mission/views/hr_official_mission.xml
@@ -27,7 +27,8 @@
states="send" groups="hr_base.group_division_manager"/>
-
+
-
+
+ states="accounting_manager_final"
+ groups="hr_base.group_general_manager,hr_base.group_executive_manager,hr_base.group_account_manager"/>