nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-21 14:09:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22522 from Anurag810/leave_application_fixes

Browse Source 
fix: set half day date None if half day is unchecked
This commit is contained in:
rohitwaghchaure
2020-07-08 12:40:30 +05:30
committed by GitHub
parent c7b63bfcaf 1fce8b7475
commit be9f8dc5db
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,6 +40,8 @@ frappe.ui.form.on("Leave Application", {
validate: function(frm) { validate: function(frm) {
if (frm.doc.from_date == frm.doc.to_date && frm.doc.half_day == 1){ if (frm.doc.from_date == frm.doc.to_date && frm.doc.half_day == 1){
frm.doc.half_day_date = frm.doc.from_date; frm.doc.half_day_date = frm.doc.from_date;
}else if (frm.doc.half_day == 0){
frm.doc.half_day_date = "";
} }
frm.toggle_reqd("half_day_date", frm.doc.half_day == 1); frm.toggle_reqd("half_day_date", frm.doc.half_day == 1);
}, },

2
erpnext/hr/doctype/leave_application/leave_application.py
View File

@@ -293,6 +293,8 @@ class LeaveApplication(Document):
def set_half_day_date(self): def set_half_day_date(self):
if self.from_date == self.to_date and self.half_day == 1: if self.from_date == self.to_date and self.half_day == 1:
self.half_day_date = self.from_date self.half_day_date = self.from_date
elif self.half_day == 0:
self.half_day_date = None
def notify_employee(self): def notify_employee(self):
employee = frappe.get_doc("Employee", self.employee) employee = frappe.get_doc("Employee", self.employee)