schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #17977 from rohitwaghchaure/employee_attendance_tool_ux_issue

Browse Source 
fix: could not find company all
This commit is contained in:
rohitwaghchaure
2019-06-19 14:08:33 +05:30
committed by GitHub
parent 4de1083096 8ef80fb669
commit b3cf5f0caa
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js
View File

@@ -2,9 +2,8 @@ frappe.ui.form.on("Employee Attendance Tool", {
refresh: function(frm) { refresh: function(frm) {
frm.disable_save(); frm.disable_save();
}, },
onload: function(frm) { onload: function(frm) {
frm.doc.department = frm.doc.branch = frm.doc.company = "All";
frm.set_value("date", frappe.datetime.get_today()); frm.set_value("date", frappe.datetime.get_today());
erpnext.employee_attendance_tool.load_employees(frm); erpnext.employee_attendance_tool.load_employees(frm);
}, },
@@ -24,7 +23,7 @@ frappe.ui.form.on("Employee Attendance Tool", {
company: function(frm) { company: function(frm) {
erpnext.employee_attendance_tool.load_employees(frm); erpnext.employee_attendance_tool.load_employees(frm);
} }
}); });

11
erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.py
View File

@@ -17,12 +17,11 @@ def get_employees(date, department = None, branch = None, company = None):
attendance_not_marked = [] attendance_not_marked = []
attendance_marked = [] attendance_marked = []
filters = {"status": "Active", "date_of_joining": ["<=", date]} filters = {"status": "Active", "date_of_joining": ["<=", date]}
if department != "All":
filters["department"] = department for field, value in {'department': department,
if branch != "All": 'branch': branch, 'company': company}.items():
filters["branch"] = branch if value:
if company != "All": filters[field] = value
filters["company"] = company
employee_list = frappe.get_list("Employee", fields=["employee", "employee_name"], filters=filters, order_by="employee_name") employee_list = frappe.get_list("Employee", fields=["employee", "employee_name"], filters=filters, order_by="employee_name")
marked_employee = {} marked_employee = {}