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

fix: company name with , in Job Card Summary Report

Browse Source 
(cherry picked from commit 481149814e)

# Conflicts:
#	erpnext/manufacturing/report/job_card_summary/job_card_summary.py
This commit is contained in:
s-aga-r
2022-11-27 16:55:45 +05:30
committed by Mergify
parent 2de239c73b
commit ffef0cb771
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,10 +36,18 @@ def get_data(filters):
"total_time_in_mins", "total_time_in_mins",
] ]
<<<<<<< HEAD
for field in ["work_order", "workstation", "operation", "company"]: for field in ["work_order", "workstation", "operation", "company"]:
=======
for field in ["work_order"]:
>>>>>>> 481149814e (fix: company name with `,` in `Job Card Summary Report`)
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: