nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-05 13:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove unknown field employee_name from query (#27634)

Browse Source 
* fix: remove unknown field employee_name from query

* fix: remove unknown fieldname

Co-authored-by: root <root@vultr.guest>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
(cherry picked from commit 9ebabb86b3)

# Conflicts:
#	erpnext/manufacturing/doctype/job_card/job_card.py
This commit is contained in:
Bhavesh Maheshwari
2021-09-21 20:30:53 +05:30
committed by Mergify
parent c3b45c933a
commit 90af9512f7
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/manufacturing/doctype/job_card/job_card.py
View File

@@ -1486,8 +1486,12 @@ def get_job_details(start, end, filters=None):
conditions = get_filters_cond("Job Card", filters, []) conditions = get_filters_cond("Job Card", filters, [])
<<<<<<< HEAD
job_cards = frappe.db.sql( job_cards = frappe.db.sql(
f""" SELECT `tabJob Card`.name, `tabJob Card`.work_order, f""" SELECT `tabJob Card`.name, `tabJob Card`.work_order,
=======
job_cards = frappe.db.sql(""" SELECT `tabJob Card`.name, `tabJob Card`.work_order,
>>>>>>> 9ebabb86b3 (fix: remove unknown field employee_name from query (#27634))
`tabJob Card`.status, ifnull(`tabJob Card`.remarks, ''), `tabJob Card`.status, ifnull(`tabJob Card`.remarks, ''),
min(`tabJob Card Time Log`.from_time) as from_time, min(`tabJob Card Time Log`.from_time) as from_time,
max(`tabJob Card Time Log`.to_time) as to_time max(`tabJob Card Time Log`.to_time) as to_time
@@ -1499,10 +1503,16 @@ def get_job_details(start, end, filters=None):
) )
for d in job_cards: for d in job_cards:
<<<<<<< HEAD
subject_data = [] subject_data = []
for field in ["name", "work_order", "remarks"]: for field in ["name", "work_order", "remarks"]:
if not d.get(field): if not d.get(field):
continue continue
=======
subject_data = []
for field in ["name", "work_order", "remarks"]:
if not d.get(field): continue
>>>>>>> 9ebabb86b3 (fix: remove unknown field employee_name from query (#27634))
subject_data.append(d.get(field)) subject_data.append(d.get(field))