From ce5419888b8ef65c083918413561e1765955e08b Mon Sep 17 00:00:00 2001 From: s-aga-r Date: Sun, 27 Nov 2022 16:57:38 +0530 Subject: [PATCH] fix: `production_item` filter in `Job Card Summary Report` (cherry picked from commit ef7fd670fcbe3b5c0ea776bfd54f73e34d57509f) # Conflicts: # erpnext/manufacturing/report/job_card_summary/job_card_summary.py --- .../manufacturing/report/job_card_summary/job_card_summary.py | 4 ++++ 1 file changed, 4 insertions(+) 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 9058a5d13f3..715b12e4ff9 100644 --- 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))