From 0ad7db3bbd1b0b3d43af98c536cbf62df07a6e9a Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 24 Nov 2014 14:33:30 +0530 Subject: [PATCH] Minor fix in salary slip net total calculation --- erpnext/hr/doctype/salary_slip/salary_slip.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py index 7c905a666c..f30fe02fa9 100644 --- a/erpnext/hr/doctype/salary_slip/salary_slip.py +++ b/erpnext/hr/doctype/salary_slip/salary_slip.py @@ -156,7 +156,7 @@ class SalarySlip(TransactionBase): / cint(self.total_days_in_month), 2) elif not self.payment_days: d.e_modified_amount = 0 - else: + elif not d.e_modified_amount: d.e_modified_amount = d.e_amount self.gross_pay += flt(d.e_modified_amount) @@ -168,7 +168,7 @@ class SalarySlip(TransactionBase): / cint(self.total_days_in_month), 2) elif not self.payment_days: d.d_modified_amount = 0 - else: + elif not d.d_modified_amount: d.d_modified_amount = d.d_amount self.total_deduction += flt(d.d_modified_amount)