From 90af9512f7058a1e27e68ea3d0593366eea945e4 Mon Sep 17 00:00:00 2001 From: Bhavesh Maheshwari <34086262+bhavesh95863@users.noreply.github.com> Date: Tue, 21 Sep 2021 20:30:53 +0530 Subject: [PATCH] fix: remove unknown field employee_name from query (#27634) * fix: remove unknown field employee_name from query * fix: remove unknown fieldname Co-authored-by: root Co-authored-by: Ankush Menat (cherry picked from commit 9ebabb86b3d28e2c94eb2761f1864c88b6eb1e59) # Conflicts: # erpnext/manufacturing/doctype/job_card/job_card.py --- erpnext/manufacturing/doctype/job_card/job_card.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/erpnext/manufacturing/doctype/job_card/job_card.py b/erpnext/manufacturing/doctype/job_card/job_card.py index 64e1c2dd3a7..9c28253ce5c 100644 --- a/erpnext/manufacturing/doctype/job_card/job_card.py +++ b/erpnext/manufacturing/doctype/job_card/job_card.py @@ -1486,8 +1486,12 @@ def get_job_details(start, end, filters=None): conditions = get_filters_cond("Job Card", filters, []) +<<<<<<< HEAD job_cards = frappe.db.sql( 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, ''), min(`tabJob Card Time Log`.from_time) as from_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: +<<<<<<< HEAD subject_data = [] for field in ["name", "work_order", "remarks"]: if not d.get(field): 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))