fix: production_item filter in Job Card Summary Report

(cherry picked from commit ef7fd67) # Conflicts: # erpnext/manufacturing/report/job_card_summary/job_card_summary.py
frappe · Nov 26, 2022 · ce54198 · ce54198
1 parent ffef0cb
commit ce54198
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/erpnext/manufacturing/report/job_card_summary/job_card_summary.py b/erpnext/manufacturing/report/job_card_summary/job_card_summary.py
@@ -36,11 +36,15 @@ def get_data(filters):
 		"total_time_in_mins",
 	]
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 	for field in ["work_order", "workstation", "operation", "company"]:
 =======
 	for field in ["work_order"]:
 >>>>>>> 481149814e (fix: company name with `,` in `Job Card Summary Report`)
+=======
+	for field in ["work_order", "production_item"]:
+>>>>>>> ef7fd670fc (fix: `production_item` filter in `Job Card Summary Report`)
 		if filters.get(field):
 			query_filters[field] = ("in", filters.get(field))