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

fix: Error handling in Upload Attendance (#23907)

Browse Source
This commit is contained in:
Anurag Mishra 2020-11-15 11:14:35 +05:30 committed by GitHub
parent 7178df8567
commit 69be37f88d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/hr/doctype/upload_attendance/upload_attendance.js
View File

@ -24,10 +24,10 @@ erpnext.hr.AttendanceControlPanel = frappe.ui.form.Controller.extend({
} }
window.location.href = repl(frappe.request.url + window.location.href = repl(frappe.request.url +
'?cmd=%(cmd)s&from_date=%(from_date)s&to_date=%(to_date)s', { '?cmd=%(cmd)s&from_date=%(from_date)s&to_date=%(to_date)s', {
cmd: "erpnext.hr.doctype.upload_attendance.upload_attendance.get_template", cmd: "erpnext.hr.doctype.upload_attendance.upload_attendance.get_template",
from_date: this.frm.doc.att_fr_date, from_date: this.frm.doc.att_fr_date,
to_date: this.frm.doc.att_to_date, to_date: this.frm.doc.att_to_date,
}); });
}, },
show_upload() { show_upload() {

7
erpnext/hr/doctype/upload_attendance/upload_attendance.py
View File

@ -28,7 +28,12 @@ def get_template():
w = UnicodeWriter() w = UnicodeWriter()
w = add_header(w) w = add_header(w)
w = add_data(w, args) try:
w = add_data(w, args)
except Exception as e:
frappe.clear_messages()
frappe.respond_as_web_page("Holiday List Missing", html=e)
return
# write out response as a type csv # write out response as a type csv
frappe.response['result'] = cstr(w.getvalue()) frappe.response['result'] = cstr(w.getvalue())