commit 0d505237237e50556b21c65124f25a6a3cfa2d45
author Saurabh <saurabh6790@gmail.com> Fri Jun 14 11:19:31 2019 +0530
committer GitHub <noreply@github.com> Fri Jun 14 11:19:31 2019 +0530
tree 15b7e87b938fbdbe0875c89f2dd3dca75698659b
parent 5a02aa0d5c859a789aed4bfa47042ff4880f8032
parent a2caf884fe038e2a7e04e5b2275152b4a33d883d

Merge pull request #17941 from nabinhait/salary-slip-amount-dev

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 70ac6fe..3e3cf40 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.py
@@ -448,6 +448,8 @@
 
 				if not overwrite and component_row.default_amount:
 					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