fix: add list view settings for Gratuity
(cherry picked from commit 79b0aede00)
# Conflicts:
# erpnext/payroll/doctype/gratuity/gratuity.json
This commit is contained in:
@@ -90,9 +90,8 @@
|
||||
"fieldtype": "Select",
|
||||
"in_list_view": 1,
|
||||
"label": "Status",
|
||||
"options": "Draft\nUnpaid\nPaid",
|
||||
"read_only": 1,
|
||||
"reqd": 1
|
||||
"options": "Draft\nUnpaid\nPaid\nSubmitted\nCancelled",
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"depends_on": "eval: doc.pay_via_salary_slip == 0",
|
||||
@@ -196,7 +195,11 @@
|
||||
"index_web_pages_for_search": 1,
|
||||
"is_submittable": 1,
|
||||
"links": [],
|
||||
<<<<<<< HEAD
|
||||
"modified": "2020-11-02 18:21:11.971488",
|
||||
=======
|
||||
"modified": "2022-05-27 13:56:14.349183",
|
||||
>>>>>>> 79b0aede00 (fix: add list view settings for Gratuity)
|
||||
"modified_by": "Administrator",
|
||||
"module": "Payroll",
|
||||
"name": "Gratuity",
|
||||
|
||||
12
erpnext/payroll/doctype/gratuity/gratuity_list.js
Normal file
12
erpnext/payroll/doctype/gratuity/gratuity_list.js
Normal file
@@ -0,0 +1,12 @@
|
||||
frappe.listview_settings["Gratuity"] = {
|
||||
get_indicator: function(doc) {
|
||||
let status_color = {
|
||||
"Draft": "red",
|
||||
"Submitted": "blue",
|
||||
"Cancelled": "red",
|
||||
"Paid": "green",
|
||||
"Unpaid": "orange",
|
||||
};
|
||||
return [__(doc.status), status_color[doc.status], "status,=,"+doc.status];
|
||||
}
|
||||
};
|
||||
Reference in New Issue
Block a user