commit a2caf884fe038e2a7e04e5b2275152b4a33d883d
author Nabin Hait <nabinhait@gmail.com> Thu Jun 13 19:43:47 2019 +0530
committer Nabin Hait <nabinhait@gmail.com> Thu Jun 13 19:44:21 2019 +0530
tree cef3f638eabfe44b177ac09662bd29a2d11f4c9e
parent 0c2e3c77a32d2875b58239f12093d933b1ebbbd5

fix: salary slip amount calculation based on formula

erpnext/hr/doctype/salary_slip/salary_slip.py

diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py
index 125a8ae..11eb696 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.py
@@ -446,6 +446,8 @@
 
 				if not overwrite:
 					amount += component_row.default_amount
+			else:
+				component_row.default_amount = amount
 
 			component_row.amount = amount
 			component_row.deduct_full_tax_on_selected_payroll_date = struct_row.deduct_full_tax_on_selected_payroll_date