schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert: remove default Payment Request indicator color

Browse Source 
(cherry picked from commit 37ceb09955)

# Conflicts:
#	erpnext/accounts/doctype/payment_request/payment_request_list.js
This commit is contained in:
Abdeali Chharchhoda
2024-11-26 12:10:05 +05:30
committed by Mergify
parent 0d67c62f43
commit 9c4b5814a6
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/doctype/payment_request/payment_request_list.js
View File

@@ -11,6 +11,7 @@ const INDICATORS = {
frappe.listview_settings["Payment Request"] = { frappe.listview_settings["Payment Request"] = {
add_fields: ["status"], add_fields: ["status"],
get_indicator: function (doc) { get_indicator: function (doc) {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
if (doc.status == "Draft") { if (doc.status == "Draft") {
return [__("Draft"), "gray", "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}`]; return [__(doc.status), INDICATORS[doc.status] || "gray", `status,=,${doc.status}`];
>>>>>>> e1c4d6e1e6 (refactor: Used object to get payment request status indicator) >>>>>>> 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)
}, },
}; };