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

[Fix] Salary slip

Browse Source
This commit is contained in:
Rohit Waghchaure 2018-10-01 12:00:45 +05:30
parent 7d6d678e8d
commit 8fbf856618
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,7 +113,6 @@ frappe.ui.form.on('Salary Slip Timesheet', {
// Get leave details // Get leave details
//--------------------------------------------------------------------- //---------------------------------------------------------------------
var get_emp_and_leave_details = function(doc, dt, dn) { var get_emp_and_leave_details = function(doc, dt, dn) {
if(!doc.start_date){
return frappe.call({ return frappe.call({
method: 'get_emp_and_leave_details', method: 'get_emp_and_leave_details',
doc: locals[dt][dn], doc: locals[dt][dn],
@ -123,7 +122,6 @@ var get_emp_and_leave_details = function(doc, dt, dn) {
} }
}); });
} }
}
cur_frm.cscript.employee = function(doc,dt,dn){ cur_frm.cscript.employee = function(doc,dt,dn){
get_emp_and_leave_details(doc, dt, dn); get_emp_and_leave_details(doc, dt, dn);