revert: remove default Payment Request indicator color
(cherry picked from commit 37ceb09955)
# Conflicts:
# erpnext/accounts/doctype/payment_request/payment_request_list.js
This commit is contained in:
committed by
Mergify
parent
0d67c62f43
commit
9c4b5814a6
@@ -11,6 +11,7 @@ const INDICATORS = {
|
||||
frappe.listview_settings["Payment Request"] = {
|
||||
add_fields: ["status"],
|
||||
get_indicator: function (doc) {
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
if (doc.status == "Draft") {
|
||||
return [__("Draft"), "gray", "status,=,Draft"];
|
||||
@@ -29,5 +30,10 @@ frappe.listview_settings["Payment Request"] = {
|
||||
=======
|
||||
return [__(doc.status), INDICATORS[doc.status] || "gray", `status,=,${doc.status}`];
|
||||
>>>>>>> e1c4d6e1e6 (refactor: Used object to get payment request status indicator)
|
||||
=======
|
||||
if (!doc.status || !INDICATORS[doc.status]) return;
|
||||
|
||||
return [__(doc.status), INDICATORS[doc.status], `status,=,${doc.status}`];
|
||||
>>>>>>> 37ceb09955 (revert: remove default `Payment Request` indicator color)
|
||||
},
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user