commit 74d45f40a816cfb750b380e70dcdea820b7c8a9b
author rohitwaghchaure <rohitw1991@gmail.com> Fri Jun 07 12:58:25 2019 +0530
committer GitHub <noreply@github.com> Fri Jun 07 12:58:25 2019 +0530
tree ba59afcd5f0bd848f344da64d1e20c391bd7f4f0
parent 74f502cfa6f2a53e3bfdf5d4f56e375dcb2a425b
parent 72264697be0a770147bded3d231b7016622a7707

Merge pull request #17876 from rohitwaghchaure/salary_slip_update_component_row_error_develop

fix: Not able to save salary slip

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 bdb2080..70ac6fe 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.py
@@ -446,7 +446,7 @@
 				else:
 					component_row.additional_amount = amount
 
-				if not overwrite:
+				if not overwrite and component_row.default_amount:
 					amount += component_row.default_amount
 
 			component_row.amount = amount