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

[fixes] salary slip

Browse Source
This commit is contained in:
Nabin Hait
2013-05-03 15:40:26 +05:30
parent 317f0273e7
commit c51c0ce3e9
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -152,7 +152,7 @@ class DocType(TransactionBase):
d.e_modified_amount = round(flt(d.e_amount)*flt(self.doc.payment_days)/cint(self.doc.total_days_in_month), 2)
elif not self.doc.payment_days:
d.e_modified_amount = 0
self.doc.gross_pay += d.e_modified_amount
self.doc.gross_pay += flt(d.e_modified_amount)
def calculate_ded_total(self):
"""
@@ -165,7 +165,7 @@ class DocType(TransactionBase):
elif not self.doc.payment_days:
d.d_modified_amount = 0
self.doc.total_deduction += d.d_modified_amount
self.doc.total_deduction += flt(d.d_modified_amount)
def calculate_net_pay(self):
"""