commit dde952d591decd981aafe3a79b906118e495a9ab
author Nabin Hait <nabinhait@gmail.com> Tue Nov 27 11:39:10 2018 +0530
committer GitHub <noreply@github.com> Tue Nov 27 11:39:10 2018 +0530
tree 9e3ef392415104869867470eaf2b6597f0e60cca
parent a9f72bd3ceaddb9aba5815a086ff7192fbe7fcd2
parent bd87903b56f6f3b06debf95287fba55a6348e6a3

Merge pull request #16092 from deepeshgarg007/salary_slip

Salary slip earnings and deductions table bug fix

erpnext/hr/doctype/salary_slip/salary_slip.js

diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.js b/erpnext/hr/doctype/salary_slip/salary_slip.js
index affbb55..86c50d0 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.js
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.js
@@ -177,7 +177,7 @@
 		if(cint(tbl[i].depends_on_lwp) == 1) {
 			tbl[i].amount =  Math.round(tbl[i].default_amount)*(flt(doc.payment_days) /
 				cint(doc.total_working_days)*100)/100;
-		} else if(reset_amount) {
+		} else if(reset_amount && tbl[i].default_amount) {
 			tbl[i].amount = tbl[i].default_amount;
 		}
 		if(!tbl[i].do_not_include_in_total) {
@@ -198,7 +198,7 @@
 	for(var i = 0; i < tbl.length; i++){
 		if(cint(tbl[i].depends_on_lwp) == 1) {
 			tbl[i].amount = Math.round(tbl[i].default_amount)*(flt(doc.payment_days)/cint(doc.total_working_days)*100)/100;
-		} else if(reset_amount) {
+		} else if(reset_amount && tbl[i].default_amount) {
 			tbl[i].amount = tbl[i].default_amount;
 		}
 		if(!tbl[i].do_not_include_in_total) {