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

Merge pull request #22723 from Anurag810/HR-fix

Browse Source
This commit is contained in:
Suraj Shetty 2020-08-14 16:43:28 +05:30 committed by GitHub
commit 404afb823f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,20 +5,23 @@ cur_frm.add_fetch('employee','employee_name','employee_name');
frappe.ui.form.on("Leave Allocation", { frappe.ui.form.on("Leave Allocation", {
onload: function(frm) { onload: function(frm) {
// Ignore cancellation of doctype on cancel all.
frm.ignore_doctypes_on_cancel_all = ["Leave Ledger Entry"];
if(!frm.doc.from_date) frm.set_value("from_date", frappe.datetime.get_today()); if(!frm.doc.from_date) frm.set_value("from_date", frappe.datetime.get_today());
frm.set_query("employee", function() { frm.set_query("employee", function() {
return { return {
query: "erpnext.controllers.queries.employee_query" query: "erpnext.controllers.queries.employee_query"
} };
}); });
frm.set_query("leave_type", function() { frm.set_query("leave_type", function() {
return { return {
filters: { filters: {
is_lwp: 0 is_lwp: 0
} }
} };
}) });
}, },
refresh: function(frm) { refresh: function(frm) {

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

@ -19,6 +19,10 @@ frappe.ui.form.on("Leave Application", {
frm.set_query("employee", erpnext.queries.employee); frm.set_query("employee", erpnext.queries.employee);
}, },
onload: function(frm) { onload: function(frm) {
// Ignore cancellation of doctype on cancel all.
frm.ignore_doctypes_on_cancel_all = ["Leave Ledger Entry"];
if (!frm.doc.posting_date) { if (!frm.doc.posting_date) {
frm.set_value("posting_date", frappe.datetime.get_today()); frm.set_value("posting_date", frappe.datetime.get_today());
} }

4
erpnext/hr/doctype/leave_encashment/leave_encashment.js
View File

@ -2,6 +2,10 @@
// For license information, please see license.txt // For license information, please see license.txt
frappe.ui.form.on('Leave Encashment', { frappe.ui.form.on('Leave Encashment', {
onload: function(frm) {
// Ignore cancellation of doctype on cancel all.
frm.ignore_doctypes_on_cancel_all = ["Leave Ledger Entry"];
},
setup: function(frm) { setup: function(frm) {
frm.set_query("leave_type", function() { frm.set_query("leave_type", function() {
return { return {