nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-04 04:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: display carry forwarded allocation days and total leaves allocated

Browse Source
This commit is contained in:
Mangesh-Khairnar
2019-04-25 19:54:40 +05:30
parent 0abf5d340c
commit 5e2b067107
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
erpnext/hr/doctype/leave_allocation/leave_allocation.js
View File

@@ -34,34 +34,31 @@ frappe.ui.form.on("Leave Allocation", {
}, },
carry_forwarded_leaves: function(frm) { carry_forwarded_leaves: function(frm) {
frm.set_value("total_leaves_allocated", frm.set_value("total_leaves_allocated", flt(frm.doc.carry_forwarded_leaves));
flt(frm.doc.carry_forwarded_leaves) + flt(frm.doc.new_leaves_allocated));
}, },
new_leaves_allocated: function(frm) { new_leaves_allocated: function(frm) {
frm.set_value("total_leaves_allocated", frm.set_value("total_leaves_allocated", flt(frm.doc.new_leaves_allocated));
flt(frm.doc.carry_forwarded_leaves) + flt(frm.doc.new_leaves_allocated));
}, },
calculate_total_leaves_allocated: function(frm) { calculate_total_leaves_allocated: function(frm) {
if (cint(frm.doc.carry_forward) == 1 && frm.doc.leave_type && frm.doc.employee) { if (cint(frm.doc.carry_forward) === 1 && frm.doc.leave_type && frm.doc.employee) {
return frappe.call({ return frappe.call({
method: "erpnext.hr.doctype.leave_allocation.leave_allocation.get_carry_forwarded_leaves", method: "erpnext.hr.doctype.leave_allocation.leave_allocation.get_carry_forwarded_leaves",
args: { args: {
"employee": frm.doc.employee, "employee": frm.doc.employee,
"date": frm.doc.from_date,
"leave_type": frm.doc.leave_type, "leave_type": frm.doc.leave_type,
"carry_forward": frm.doc.carry_forward "date": frm.doc.from_date,
}, },
callback: function(r) { callback: function(r) {
if (!r.exc && r.message) { if (!r.exc && r.message) {
frm.set_value("new_leaves_allocated", 0);
frm.set_value('carry_forwarded_leaves', r.message); frm.set_value('carry_forwarded_leaves', r.message);
frm.set_value("total_leaves_allocated", frm.set_value("total_leaves_allocated", flt(r.message));
flt(r.message) + flt(frm.doc.new_leaves_allocated));
} }
} }
}) })
} else if (cint(frm.doc.carry_forward) == 0) { } else if (cint(frm.doc.carry_forward) === 0) {
frm.set_value("carry_forwarded_leaves", 0); frm.set_value("carry_forwarded_leaves", 0);
frm.set_value("total_leaves_allocated", flt(frm.doc.new_leaves_allocated)); frm.set_value("total_leaves_allocated", flt(frm.doc.new_leaves_allocated));
} }