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

Merge pull request #15545 from rohitwaghchaure/salary_slip_not_creating_because_of_the_date_issue

Browse Source 
[Fix] Salary slip
This commit is contained in:
rohitwaghchaure
2018-10-01 12:03:26 +05:30
committed by GitHub
parent 7d6d678e8d 8fbf856618
commit 6b62b86bbf
1 changed files with 8 additions and 10 deletions
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);