Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #33120 from s-aga-r/fix/github-issue/32955

Browse Source 
fix: `Work Order Summary` and `Job Card Summary` Report
This commit is contained in:
Sagar Sharma 2022-11-26 21:54:00 +05:30 committed by GitHub
commit 0919976414
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/manufacturing/report/job_card_summary/job_card_summary.js
View File

@ -54,11 +54,11 @@ frappe.query_reports["Job Card Summary"] = {
options: ["", "Open", "Work In Progress", "Completed", "On Hold"] options: ["", "Open", "Work In Progress", "Completed", "On Hold"]
}, },
{ {
label: __("Sales Orders"), label: __("Work Orders"),
fieldname: "sales_order", fieldname: "work_order",
fieldtype: "MultiSelectList", fieldtype: "MultiSelectList",
get_data: function(txt) { get_data: function(txt) {
return frappe.db.get_link_options('Sales Order', txt); return frappe.db.get_link_options('Work Order', txt);
} }
}, },
{ {

6
erpnext/manufacturing/report/job_card_summary/job_card_summary.py
View File

@ -36,10 +36,14 @@ def get_data(filters):
"total_time_in_mins", "total_time_in_mins",
] ]
for field in ["work_order", "workstation", "operation", "status", "company"]: for field in ["work_order", "production_item"]:
if filters.get(field): if filters.get(field):
query_filters[field] = ("in", 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) data = frappe.get_all("Job Card", fields=fields, filters=query_filters)
if not data: if not data:

6
erpnext/manufacturing/report/work_order_summary/work_order_summary.py
View File

@ -39,10 +39,14 @@ def get_data(filters):
"lead_time", "lead_time",
] ]
for field in ["sales_order", "production_item", "status", "company"]: for field in ["sales_order", "production_item"]:
if filters.get(field): if filters.get(field):
query_filters[field] = ("in", 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_start_date"] = (">=", filters.get("from_date"))
query_filters["planned_end_date"] = ("<=", filters.get("to_date")) query_filters["planned_end_date"] = ("<=", filters.get("to_date"))