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

[bug] Leave application ui issues fixed (#13740)

Browse Source 
* validate to_date in leave application

if to_date is less than from_date show message to user
reset to_date value to ''

* var declaration and semicolon missed

* Updated popup message
This commit is contained in:
Shridhar Patil 2018-04-24 14:45:11 +05:30 committed by Nabin Hait
parent 70330e8379
commit 02c93a3d05
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/hr/doctype/leave_application/leave_application.js
View File

@ -110,6 +110,15 @@ frappe.ui.form.on("Leave Application", {
calculate_total_days: function(frm) { calculate_total_days: function(frm) {
if(frm.doc.from_date && frm.doc.to_date && frm.doc.employee && frm.doc.leave_type) { if(frm.doc.from_date && frm.doc.to_date && frm.doc.employee && frm.doc.leave_type) {
var from_date = Date.parse(frm.doc.from_date);
var to_date = Date.parse(frm.doc.to_date);
if(to_date < from_date){
frappe.msgprint(__("To Date cannot be less than From Date"));
frm.set_value('to_date', '');
return;
}
// server call is done to include holidays in leave days calculations // server call is done to include holidays in leave days calculations
return frappe.call({ return frappe.call({
method: 'erpnext.hr.doctype.leave_application.leave_application.get_number_of_leave_days', method: 'erpnext.hr.doctype.leave_application.leave_application.get_number_of_leave_days',