nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 17:15:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: conflicts

Browse Source
This commit is contained in:
s-aga-r
2022-11-28 22:10:09 +05:30
parent ce5419888b
commit b39f367dbd
1 changed files with 0 additions and 8 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,15 +36,7 @@ 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))