CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-01 11:22:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: production_item filter in Job Card Summary Report

Browse Source 
(cherry picked from commit ef7fd670fc)

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

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

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