CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-09 13:26:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(salary-slip): amount calculation (#18158)

Browse Source
This commit is contained in:
Mangesh-Khairnar
2019-07-04 13:09:06 +05:30
committed by GitHub
parent 4dd48f46f3
commit 709f21692c
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):
amount, additional_amount = 0, 0
elif not row.amount:
amount = cint(row.default_amount) + cint(row.additional_amount)
amount = flt(row.default_amount) + flt(row.additional_amount)
# apply rounding
if frappe.get_cached_value("Salary Component", row.salary_component, "round_to_the_nearest_integer"):