diff --git a/hrms/hr/report/employee_leave_balance/employee_leave_balance.js b/hrms/hr/report/employee_leave_balance/employee_leave_balance.js index 6e2964af6d..45b40bffcd 100644 --- a/hrms/hr/report/employee_leave_balance/employee_leave_balance.js +++ b/hrms/hr/report/employee_leave_balance/employee_leave_balance.js @@ -44,7 +44,7 @@ frappe.query_reports["Employee Leave Balance"] = { { value: "Active", label: __("Active") }, { value: "Inactive", label: __("Inactive") }, { value: "Suspended", label: __("Suspended") }, - { value: "Left", label: __("Left", null, "Employee") }, + { value: "Ended", label: __("Ended", null, "Employee") }, ], default: "Active", }, diff --git a/hrms/hr/report/employee_leave_balance_summary/employee_leave_balance_summary.js b/hrms/hr/report/employee_leave_balance_summary/employee_leave_balance_summary.js index 1e10ec4938..7dff35a1d3 100644 --- a/hrms/hr/report/employee_leave_balance_summary/employee_leave_balance_summary.js +++ b/hrms/hr/report/employee_leave_balance_summary/employee_leave_balance_summary.js @@ -40,7 +40,7 @@ frappe.query_reports["Employee Leave Balance Summary"] = { { value: "Active", label: __("Active") }, { value: "Inactive", label: __("Inactive") }, { value: "Suspended", label: __("Suspended") }, - { value: "Left", label: __("Left") }, + { value: "Ended", label: __("Ended") }, ], default: "Active", }, diff --git a/hrms/hr/report/leave_ledger/leave_ledger.js b/hrms/hr/report/leave_ledger/leave_ledger.js index ee9914107c..26851ca2cb 100644 --- a/hrms/hr/report/leave_ledger/leave_ledger.js +++ b/hrms/hr/report/leave_ledger/leave_ledger.js @@ -38,7 +38,7 @@ frappe.query_reports["Leave Ledger"] = { { value: "Active", label: __("Active") }, { value: "Inactive", label: __("Inactive") }, { value: "Suspended", label: __("Suspended") }, - { value: "Left", label: __("Left") }, + { value: "Ended", label: __("Ended") }, ], default: "Active", }, diff --git a/hrms/payroll/doctype/salary_slip/salary_slip.py b/hrms/payroll/doctype/salary_slip/salary_slip.py index a72b568b40..a5582ce183 100644 --- a/hrms/payroll/doctype/salary_slip/salary_slip.py +++ b/hrms/payroll/doctype/salary_slip/salary_slip.py @@ -575,7 +575,7 @@ def get_payment_days(self, include_holidays_in_total_working_days): employee_status = frappe.db.get_value("Employee", self.employee, "status") if self.relieving_date < getdate(self.start_date) and employee_status != "Left": frappe.throw( - _("Employee {0} relieved on {1} must be set as 'Left'").format( + _("Employee {0} relieved on {1} must be set as 'Ended'").format( get_link_to_form("Employee", self.employee), formatdate(self.relieving_date) ) )