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

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2024-11-29 14:51:46 +05:30
parent 7e847f27dd
commit a8ef90b40c
1 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,29 +11,8 @@ 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
if (doc.status == "Draft") {
return [__("Draft"), "gray", "status,=,Draft"];
}
if (doc.status == "Requested") {
return [__("Requested"), "green", "status,=,Requested"];
} else if (doc.status == "Initiated") {
return [__("Initiated"), "green", "status,=,Initiated"];
} else if (doc.status == "Partially Paid") {
return [__("Partially Paid"), "orange", "status,=,Partially Paid"];
} else if (doc.status == "Paid") {
return [__("Paid"), "blue", "status,=,Paid"];
} else if (doc.status == "Cancelled") {
return [__("Cancelled"), "red", "status,=,Cancelled"];
}
=======
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; if (!doc.status || !INDICATORS[doc.status]) return;
return [__(doc.status), INDICATORS[doc.status], `status,=,${doc.status}`]; return [__(doc.status), INDICATORS[doc.status], `status,=,${doc.status}`];
>>>>>>> 37ceb09955 (revert: remove default `Payment Request` indicator color)
}, },
}; };