Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove set query (#13908)

Browse Source
This commit is contained in:
Shreya Shah 2018-05-03 16:19:56 +05:30 committed by Nabin Hait
parent c10820e93e
commit c4323cb6ba
2 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
erpnext/hr/doctype/department/department.js
View File

@ -3,21 +3,6 @@
frappe.ui.form.on('Department', { frappe.ui.form.on('Department', {
onload: function(frm) { 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
}
};
});
} }
}); });

10
erpnext/hr/doctype/department_approver/department_approver.py
View File

@ -10,16 +10,6 @@ from frappe.model.document import Document
class DepartmentApprover(Document): class DepartmentApprover(Document):
pass 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() @frappe.whitelist()
def get_approvers(doctype, txt, searchfield, start, page_len, filters): def get_approvers(doctype, txt, searchfield, start, page_len, filters):