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

fix: salary slip amount rounding errors (#30248)

Browse Source
This commit is contained in:
Rucha Mahabal 2022-03-15 11:39:15 +05:30 committed by GitHub
parent 8add8eb058
commit b03b9ac99f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/payroll/doctype/salary_slip/salary_slip.py
View File

@ -1002,7 +1002,7 @@ class SalarySlip(TransactionBase):
# 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"):
amount, additional_amount = rounded(amount), rounded(additional_amount) amount, additional_amount = rounded(amount or 0), rounded(additional_amount or 0)
return amount, additional_amount return amount, additional_amount
@ -1279,9 +1279,9 @@ class SalarySlip(TransactionBase):
def set_base_totals(self): def set_base_totals(self):
self.base_gross_pay = flt(self.gross_pay) * flt(self.exchange_rate) self.base_gross_pay = flt(self.gross_pay) * flt(self.exchange_rate)
self.base_total_deduction = flt(self.total_deduction) * flt(self.exchange_rate) self.base_total_deduction = flt(self.total_deduction) * flt(self.exchange_rate)
self.rounded_total = rounded(self.net_pay) self.rounded_total = rounded(self.net_pay or 0)
self.base_net_pay = flt(self.net_pay) * flt(self.exchange_rate) self.base_net_pay = flt(self.net_pay) * flt(self.exchange_rate)
self.base_rounded_total = rounded(self.base_net_pay) self.base_rounded_total = rounded(self.base_net_pay or 0)
self.set_net_total_in_words() self.set_net_total_in_words()
#calculate total working hours, earnings based on hourly wages and totals #calculate total working hours, earnings based on hourly wages and totals