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

Merge pull request #17940 from nabinhait/salary-slip-amount

Browse Source 
fix: salary slip amount calculation based on formula
This commit is contained in:
Saurabh
2019-06-14 11:20:01 +05:30
committed by GitHub
parent c5283903be a59aaf48f2
commit 87a09d2bb3
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -445,6 +445,8 @@ class SalarySlip(TransactionBase):
if not overwrite and component_row.default_amount: if not overwrite and component_row.default_amount:
amount += component_row.default_amount amount += component_row.default_amount
else:
component_row.default_amount = amount
component_row.amount = amount component_row.amount = amount
component_row.deduct_full_tax_on_selected_payroll_date = struct_row.deduct_full_tax_on_selected_payroll_date component_row.deduct_full_tax_on_selected_payroll_date = struct_row.deduct_full_tax_on_selected_payroll_date