From 533066eb878e0d8a8a699fd28850a2b1fb48bc99 Mon Sep 17 00:00:00 2001
From: deepeshgarg007 <deepeshgarg6@gmail.com>
Date: Mon, 26 Nov 2018 15:04:21 +0530
Subject: [PATCH] Salary slip bug fix
---
erpnext/hr/doctype/salary_slip/salary_slip.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.js b/erpnext/hr/doctype/salary_slip/salary_slip.js
index affbb552f7..4fa3f96891 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.js
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.js
@@ -178,7 +178,7 @@ var calculate_earning_total = function(doc, dt, dn, reset_amount) {
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].default_amount;
+ tbl[i].amount = tbl[i].amount;
}
if(!tbl[i].do_not_include_in_total) {
total_earn += flt(tbl[i].amount);
@@ -199,7 +199,7 @@ var calculate_ded_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].default_amount;
+ tbl[i].amount = tbl[i].amount;
}
if(!tbl[i].do_not_include_in_total) {
total_ded += flt(tbl[i].amount);