From e2b8af16ed75d2cca2670c96bbb85d19bf636977 Mon Sep 17 00:00:00 2001 From: Valmik Jangla Date: Thu, 10 Mar 2016 15:47:03 +0530 Subject: [PATCH] Fixed Salary Slip to work with new Holiday List --- erpnext/hr/doctype/salary_slip/salary_slip.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py index 671fbb888aa..21ee0ab7a62 100644 --- a/erpnext/hr/doctype/salary_slip/salary_slip.py +++ b/erpnext/hr/doctype/salary_slip/salary_slip.py @@ -118,9 +118,8 @@ class SalarySlip(TransactionBase): holidays = frappe.db.sql("""select t1.holiday_date from `tabHoliday` t1, `tabHoliday List` t2 where t1.parent = t2.name and t2.is_default = 1 - and t2.fiscal_year = %s and t1.holiday_date between %s and %s""", - (self.fiscal_year, start_date, end_date)) + (start_date, end_date)) holidays = [cstr(i[0]) for i in holidays] return holidays