diff --git a/yuthon_hr_employee_approval/models/yuthon_leaving_approval.py b/yuthon_hr_employee_approval/models/yuthon_leaving_approval.py index d7908043e..8cd5100d1 100644 --- a/yuthon_hr_employee_approval/models/yuthon_leaving_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_leaving_approval.py @@ -54,7 +54,7 @@ class YuthonLeavingApproval(models.Model): ('is_execution', '=', False) ]) for record in leaving_approval_ids: - if current_date >= record.end_date: + if current_date >= record.separation_date: record.employee_id.user_state = 'leave' if record.employee_id.contract_id: record.employee_id.contract_id.state = 'cancel' diff --git a/yuthon_hr_employee_approval/views/yuthon_leaving_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_leaving_approval_views.xml index 95fce9a6e..677cff0c5 100644 --- a/yuthon_hr_employee_approval/views/yuthon_leaving_approval_views.xml +++ b/yuthon_hr_employee_approval/views/yuthon_leaving_approval_views.xml @@ -56,6 +56,7 @@ +