Merge pull request #33120 from s-aga-r/fix/github-issue/32955
fix: `Work Order Summary` and `Job Card Summary` Report
diff --git a/erpnext/manufacturing/report/job_card_summary/job_card_summary.js b/erpnext/manufacturing/report/job_card_summary/job_card_summary.js
index cb771e4..782ce81 100644
--- a/erpnext/manufacturing/report/job_card_summary/job_card_summary.js
+++ b/erpnext/manufacturing/report/job_card_summary/job_card_summary.js
@@ -54,11 +54,11 @@
options: ["", "Open", "Work In Progress", "Completed", "On Hold"]
},
{
- label: __("Sales Orders"),
- fieldname: "sales_order",
+ label: __("Work Orders"),
+ fieldname: "work_order",
fieldtype: "MultiSelectList",
get_data: function(txt) {
- return frappe.db.get_link_options('Sales Order', txt);
+ return frappe.db.get_link_options('Work Order', txt);
}
},
{
diff --git a/erpnext/manufacturing/report/job_card_summary/job_card_summary.py b/erpnext/manufacturing/report/job_card_summary/job_card_summary.py
index 63c2d97..8d72ef1 100644
--- a/erpnext/manufacturing/report/job_card_summary/job_card_summary.py
+++ b/erpnext/manufacturing/report/job_card_summary/job_card_summary.py
@@ -36,10 +36,14 @@
"total_time_in_mins",
]
- for field in ["work_order", "workstation", "operation", "status", "company"]:
+ for field in ["work_order", "production_item"]:
if filters.get(field):
query_filters[field] = ("in", filters.get(field))
+ for field in ["workstation", "operation", "status", "company"]:
+ if filters.get(field):
+ query_filters[field] = filters.get(field)
+
data = frappe.get_all("Job Card", fields=fields, filters=query_filters)
if not data:
diff --git a/erpnext/manufacturing/report/work_order_summary/work_order_summary.py b/erpnext/manufacturing/report/work_order_summary/work_order_summary.py
index 41ffcbb..b69ad07 100644
--- a/erpnext/manufacturing/report/work_order_summary/work_order_summary.py
+++ b/erpnext/manufacturing/report/work_order_summary/work_order_summary.py
@@ -39,10 +39,14 @@
"lead_time",
]
- for field in ["sales_order", "production_item", "status", "company"]:
+ for field in ["sales_order", "production_item"]:
if filters.get(field):
query_filters[field] = ("in", filters.get(field))
+ for field in ["status", "company"]:
+ if filters.get(field):
+ query_filters[field] = filters.get(field)
+
query_filters["planned_start_date"] = (">=", filters.get("from_date"))
query_filters["planned_end_date"] = ("<=", filters.get("to_date"))