nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-16 08:05:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #46883 from frappe/mergify/bp/version-15-hotfix/pr-46727

Browse Source 
fix: use docstatus for status filter (backport #46727)
This commit is contained in:
ruthra kumar
2025-04-07 10:18:08 +05:30
committed by GitHub
parent c1fe8f6000 ab52524f12
commit 83b72dc1b3
5 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
erpnext/buying/doctype/purchase_order/purchase_order_list.js
View File

@@ -22,15 +22,27 @@ frappe.listview_settings["Purchase Order"] = {
return [
__("To Receive and Bill"),
"orange",
"per_received,<,100|per_billed,<,100|status,!=,Closed",
"per_received,<,100|per_billed,<,100|status,!=,Closed|docstatus,=,1",
];
} else {
return [__("To Receive"), "orange", "per_received,<,100|per_billed,=,100|status,!=,Closed"];
return [
__("To Receive"),
"orange",
"per_received,<,100|per_billed,=,100|status,!=,Closed|docstatus,=,1",
];
}
} else if (flt(doc.per_received) >= 100 && flt(doc.per_billed) < 100 && doc.status !== "Closed") {
return [__("To Bill"), "orange", "per_received,=,100|per_billed,<,100|status,!=,Closed"];
return [
__("To Bill"),
"orange",
"per_received,=,100|per_billed,<,100|status,!=,Closed|docstatus,=,1",
];
} else if (flt(doc.per_received) >= 100 && flt(doc.per_billed) == 100 && doc.status !== "Closed") {
return [__("Completed"), "green", "per_received,=,100|per_billed,=,100|status,!=,Closed"];
return [
__("Completed"),
"green",
"per_received,=,100|per_billed,=,100|status,!=,Closed|docstatus,=,1",
];
}
},
onload: function (listview) {

12
erpnext/selling/doctype/sales_order/sales_order_list.js
View File

@@ -23,10 +23,18 @@ frappe.listview_settings["Sales Order"] = {
} else if (!doc.skip_delivery_note && flt(doc.per_delivered) < 100) {
if (frappe.datetime.get_diff(doc.delivery_date) < 0) {
// not delivered & overdue
return [__("Overdue"), "red", "per_delivered,<,100|delivery_date,<,Today|status,!=,Closed"];
return [
__("Overdue"),
"red",
"per_delivered,<,100|delivery_date,<,Today|status,!=,Closed|docstatus,=,1",
];
} else if (flt(doc.grand_total) === 0) {
// not delivered (zeroount order)
return [__("To Deliver"), "orange", "per_delivered,<,100|grand_total,=,0|status,!=,Closed"];
return [
__("To Deliver"),
"orange",
"per_delivered,<,100|grand_total,=,0|status,!=,Closed|docstatus,=,1",
];
} else if (flt(doc.per_billed) < 100) {
// not delivered & not billed
return [

4
erpnext/stock/doctype/delivery_note/delivery_note_list.js
View File

@@ -19,9 +19,9 @@ frappe.listview_settings["Delivery Note"] = {
} else if (doc.status === "Return Issued") {
return [__("Return Issued"), "grey", "status,=,Return Issued"];
} else if (flt(doc.per_billed, 2) < 100) {
return [__("To Bill"), "orange", "per_billed,<,100"];
return [__("To Bill"), "orange", "per_billed,<,100|docstatus,=,1"];
} else if (flt(doc.per_billed, 2) === 100) {
return [__("Completed"), "green", "per_billed,=,100"];
return [__("Completed"), "green", "per_billed,=,100|docstatus,=,1"];
}
},
onload: function (doclist) {

2
erpnext/stock/doctype/material_request/material_request_list.js
View File

@@ -13,7 +13,7 @@ frappe.listview_settings["Material Request"] = {
return [__("Completed"), "green"];
}
} else if (doc.docstatus == 1 && flt(doc.per_ordered, precision) == 0) {
return [__("Pending"), "orange", "per_ordered,=,0"];
return [__("Pending"), "orange", "per_ordered,=,0|docstatus,=,1"];
} else if (
doc.docstatus == 1 &&
flt(doc.per_ordered, precision) < 100 &&

8
erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.js
View File

@@ -16,13 +16,13 @@ frappe.listview_settings["Purchase Receipt"] = {
} else if (doc.status === "Closed") {
return [__("Closed"), "green", "status,=,Closed"];
} else if (flt(doc.per_returned, 2) === 100) {
return [__("Return Issued"), "grey", "per_returned,=,100"];
return [__("Return Issued"), "grey", "per_returned,=,100|docstatus,=,1"];
} else if (flt(doc.grand_total) !== 0 && flt(doc.per_billed, 2) == 0) {
return [__("To Bill"), "orange", "per_billed,<,100"];
return [__("To Bill"), "orange", "per_billed,<,100|docstatus,=,1"];
} else if (flt(doc.per_billed, 2) > 0 && flt(doc.per_billed, 2) < 100) {
return [__("Partly Billed"), "yellow", "per_billed,<,100"];
return [__("Partly Billed"), "yellow", "per_billed,<,100|docstatus,=,1"];
} else if (flt(doc.grand_total) === 0 || flt(doc.per_billed, 2) === 100) {
return [__("Completed"), "green", "per_billed,=,100"];
return [__("Completed"), "green", "per_billed,=,100|docstatus,=,1"];
}
},