From c4323cb6bafb4ab1a0d59157f909aee18c8ae96f Mon Sep 17 00:00:00 2001 From: Shreya Shah Date: Thu, 3 May 2018 16:19:56 +0530 Subject: [PATCH] remove set query (#13908) --- erpnext/hr/doctype/department/department.js | 17 +---------------- .../department_approver/department_approver.py | 10 ---------- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/erpnext/hr/doctype/department/department.js b/erpnext/hr/doctype/department/department.js index 8f83db0852..71cf2d2aa9 100644 --- a/erpnext/hr/doctype/department/department.js +++ b/erpnext/hr/doctype/department/department.js @@ -3,21 +3,6 @@ frappe.ui.form.on('Department', { onload: function(frm) { - frm.set_query("leave_approver", "leave_approvers", function(doc) { - return { - query:"erpnext.hr.doctype.department_approver.department_approver.get_department_approvers", - filters:{ - user: doc.user_id - } - }; - }); - frm.set_query("expense_approver", "expense_approvers", function(doc) { - return { - query:"erpnext.hr.doctype.department_approver.department_approver.get_department_approvers", - filters:{ - user: doc.user_id - } - }; - }); + } }); diff --git a/erpnext/hr/doctype/department_approver/department_approver.py b/erpnext/hr/doctype/department_approver/department_approver.py index d3d3a0d3a2..d30d801491 100644 --- a/erpnext/hr/doctype/department_approver/department_approver.py +++ b/erpnext/hr/doctype/department_approver/department_approver.py @@ -10,16 +10,6 @@ from frappe.model.document import Document class DepartmentApprover(Document): pass -def get_department_approvers(doctype, txt, searchfield, start, page_len, filters): - return get_approver_list(filters.get("user")) - -def get_approver_list(name): - return frappe.db.sql("""select user.name, user.first_name, user.last_name from - tabUser user where - user.enabled and - user.name != %s - """, name or "") - @frappe.whitelist() def get_approvers(doctype, txt, searchfield, start, page_len, filters):