nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 17:15:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17875 from rohitwaghchaure/salary_slip_update_component_row_error

Browse Source 
fix: Not able to save salary slip
This commit is contained in:
rohitwaghchaure
2019-06-07 12:58:07 +05:30
committed by GitHub
parent 443f9ed5f1 d72f4d7959
commit ab669ad055
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/hr/doctype/salary_slip/salary_slip.py
View File

@@ -443,7 +443,7 @@ class SalarySlip(TransactionBase):
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