CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-23 13:12:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(report): allow Closed sales orders to be visible

Browse Source 
(cherry picked from commit 2394e76e7d)

# Conflicts:
#	erpnext/selling/report/sales_order_analysis/sales_order_analysis.js
This commit is contained in:
Ninad1306
2025-02-25 15:59:46 +05:30
committed by Mergify
parent 20c4487853
commit 8799af9747
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/selling/report/sales_order_analysis/sales_order_analysis.js
View File

@@ -53,10 +53,21 @@ frappe.query_reports["Sales Order Analysis"] = {
fieldname: "status", fieldname: "status",
label: __("Status"), label: __("Status"),
fieldtype: "MultiSelectList", fieldtype: "MultiSelectList",
options: ["To Pay", "To Bill", "To Deliver", "To Deliver and Bill", "Completed"], options: ["To Pay", "To Bill", "To Deliver", "To Deliver and Bill", "Completed", "Closed"],
width: "80", width: "80",
get_data: function (txt) { get_data: function (txt) {
<<<<<<< HEAD
let status = ["To Bill", "To Deliver", "To Deliver and Bill", "Completed"]; let status = ["To Bill", "To Deliver", "To Deliver and Bill", "Completed"];
=======
let status = [
"To Pay",
"To Bill",
"To Deliver",
"To Deliver and Bill",
"Completed",
"Closed",
];
>>>>>>> 2394e76e7d (fix(report): allow `Closed` sales orders to be visible)
let options = []; let options = [];
for (let option of status) { for (let option of status) {
options.push({ options.push({

2
erpnext/selling/report/sales_order_analysis/sales_order_analysis.py
View File

@@ -86,7 +86,7 @@ def get_data(conditions, filters):
ON sii.so_detail = soi.name and sii.docstatus = 1 ON sii.so_detail = soi.name and sii.docstatus = 1
WHERE WHERE
soi.parent = so.name soi.parent = so.name
and so.status not in ('Stopped', 'Closed', 'On Hold') and so.status not in ('Stopped', 'On Hold')
and so.docstatus = 1 and so.docstatus = 1
{conditions} {conditions}
GROUP BY soi.name GROUP BY soi.name