Merge branch 'staging-fixes' into indicators-in-leave-applications
diff --git a/erpnext/hr/doctype/leave_application/leave_application_list.js b/erpnext/hr/doctype/leave_application/leave_application_list.js
index d7588da..f69b182 100644
--- a/erpnext/hr/doctype/leave_application/leave_application_list.js
+++ b/erpnext/hr/doctype/leave_application/leave_application_list.js
@@ -1,3 +1,10 @@
frappe.listview_settings['Leave Application'] = {
- add_fields: ["leave_type", "employee", "employee_name", "total_leave_days", "from_date", "to_date"]
+ add_fields: ["leave_type", "employee", "employee_name", "total_leave_days", "from_date", "to_date"],
+ get_indicator: function (doc) {
+ if (doc.status === "Approved") {
+ return [__("Approved"), "green", "status,=,Approved"];
+ } else if (doc.status === "Rejected") {
+ return [__("Rejected"), "red", "status,=,Rejected"];
+ }
+ }
};