Skip to content

Commit

Permalink
revert: remove default Payment Request indicator color
Browse files Browse the repository at this point in the history
(cherry picked from commit 37ceb09)

# Conflicts:
#	erpnext/accounts/doctype/payment_request/payment_request_list.js
  • Loading branch information
Abdeali099 authored and mergify[bot] committed Nov 29, 2024
1 parent 0d67c62 commit 9c4b581
Showing 1 changed file with 6 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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"];
Expand All @@ -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)
},
};

0 comments on commit 9c4b581

Please sign in to comment.