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

Merge pull request #23897 from Anurag810/salary_slip_fixes

Browse Source 
fix: added wrong absent days calculation in salary slip
This commit is contained in:
Anurag Mishra
2020-11-16 15:56:43 +05:30
committed by GitHub
parent 17d5ce3e41 d6e6c51f37
commit 70816fdae8
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -240,7 +240,6 @@ class SalarySlip(TransactionBase):
self.absent_days += unmarked_days #will be treated as absent self.absent_days += unmarked_days #will be treated as absent
self.payment_days -= unmarked_days self.payment_days -= unmarked_days
if include_holidays_in_total_working_days: if include_holidays_in_total_working_days:
self.absent_days -= len(holidays)
for holiday in holidays: for holiday in holidays:
if not frappe.db.exists("Attendance", {"employee": self.employee, "attendance_date": holiday, "docstatus": 1 }): if not frappe.db.exists("Attendance", {"employee": self.employee, "attendance_date": holiday, "docstatus": 1 }):
self.payment_days += 1 self.payment_days += 1