Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17876 from rohitwaghchaure/salary_slip_update_component_row_error_develop

Browse Source 
fix: Not able to save salary slip
This commit is contained in:
rohitwaghchaure 2019-06-07 12:58:25 +05:30 committed by GitHub
commit 74d45f40a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -446,7 +446,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