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

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

Browse Source 
fix: salary slip amount calculation based on formula
This commit is contained in:
Saurabh 2019-06-14 11:19:31 +05:30 committed by GitHub
commit 0d50523723
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 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

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