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

Fixed net_pay calculation issue

Browse Source
This commit is contained in:
navdeepghai1
2019-01-28 10:42:16 +04:00
parent d801437f5f
commit aac404a155
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -360,7 +360,7 @@ class SalarySlip(TransactionBase):
elif not d.amount: elif not d.amount:
d.amount = d.default_amount d.amount = d.default_amount
if not d.do_not_include_in_total: if not d.do_not_include_in_total:
self.set(total_field, self.get(total_field) + flt(d.amount)) self.set(total_field, self.get(total_field) + flt(d.amount, 2))
def calculate_net_pay(self): def calculate_net_pay(self):
if self.salary_structure: if self.salary_structure:
@@ -473,4 +473,4 @@ def unlink_ref_doc_from_salary_slip(ref_no):
if linked_ss: if linked_ss:
for ss in linked_ss: for ss in linked_ss:
ss_doc = frappe.get_doc("Salary Slip", ss) ss_doc = frappe.get_doc("Salary Slip", ss)
frappe.db.set_value("Salary Slip", ss_doc.name, "journal_entry", "") frappe.db.set_value("Salary Slip", ss_doc.name, "journal_entry", "")