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

fix: Salary slip amount calculation (#18146)

Browse Source
This commit is contained in:
Mangesh-Khairnar
2019-07-03 17:27:40 +05:30
committed by Anurag Mishra
parent 29433f2b1b
commit cc80be449d
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

@@ -618,7 +618,7 @@ class SalarySlip(TransactionBase):
elif not self.payment_days and not self.salary_slip_based_on_timesheet and cint(row.depends_on_payment_days): elif not self.payment_days and not self.salary_slip_based_on_timesheet and cint(row.depends_on_payment_days):
amount, additional_amount = 0, 0 amount, additional_amount = 0, 0
elif not row.amount: elif not row.amount:
amount = row.default_amount + row.additional_amount amount = cint(row.default_amount) + cint(row.additional_amount)
# apply rounding # apply rounding
if frappe.get_cached_value("Salary Component", row.salary_component, "round_to_the_nearest_integer"): if frappe.get_cached_value("Salary Component", row.salary_component, "round_to_the_nearest_integer"):