fix: could not find company all (#17978)
This commit is contained in:
parent
23deb6f79b
commit
d2061b44dd
@ -2,9 +2,8 @@ frappe.ui.form.on("Employee Attendance Tool", {
|
||||
refresh: function(frm) {
|
||||
frm.disable_save();
|
||||
},
|
||||
|
||||
|
||||
onload: function(frm) {
|
||||
frm.doc.department = frm.doc.branch = frm.doc.company = "All";
|
||||
frm.set_value("date", frappe.datetime.get_today());
|
||||
erpnext.employee_attendance_tool.load_employees(frm);
|
||||
},
|
||||
@ -24,7 +23,7 @@ frappe.ui.form.on("Employee Attendance Tool", {
|
||||
company: function(frm) {
|
||||
erpnext.employee_attendance_tool.load_employees(frm);
|
||||
}
|
||||
|
||||
|
||||
});
|
||||
|
||||
|
||||
|
@ -17,12 +17,11 @@ def get_employees(date, department = None, branch = None, company = None):
|
||||
attendance_not_marked = []
|
||||
attendance_marked = []
|
||||
filters = {"status": "Active", "date_of_joining": ["<=", date]}
|
||||
if department != "All":
|
||||
filters["department"] = department
|
||||
if branch != "All":
|
||||
filters["branch"] = branch
|
||||
if company != "All":
|
||||
filters["company"] = company
|
||||
|
||||
for field, value in {'department': department,
|
||||
'branch': branch, 'company': company}.items():
|
||||
if value:
|
||||
filters[field] = value
|
||||
|
||||
employee_list = frappe.get_list("Employee", fields=["employee", "employee_name"], filters=filters, order_by="employee_name")
|
||||
marked_employee = {}
|
||||
|
Loading…
x
Reference in New Issue
Block a user