From bd87903b56f6f3b06debf95287fba55a6348e6a3 Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Mon, 26 Nov 2018 17:13:59 +0530 Subject: [PATCH] Added condition for default amount --- erpnext/hr/doctype/salary_slip/salary_slip.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.js b/erpnext/hr/doctype/salary_slip/salary_slip.js index 4fa3f96891..86c50d08ba 100644 --- a/erpnext/hr/doctype/salary_slip/salary_slip.js +++ b/erpnext/hr/doctype/salary_slip/salary_slip.js @@ -177,8 +177,8 @@ var calculate_earning_total = function(doc, dt, dn, reset_amount) { 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) { - tbl[i].amount = tbl[i].amount; + } else if(reset_amount && tbl[i].default_amount) { + tbl[i].amount = tbl[i].default_amount; } if(!tbl[i].do_not_include_in_total) { total_earn += flt(tbl[i].amount); @@ -198,8 +198,8 @@ var calculate_ded_total = function(doc, dt, dn, reset_amount) { 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) { - tbl[i].amount = tbl[i].amount; + } else if(reset_amount && tbl[i].default_amount) { + tbl[i].amount = tbl[i].default_amount; } if(!tbl[i].do_not_include_in_total) { total_ded += flt(tbl[i].amount);