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

Fixed Salary Slip to work with new Holiday List

Browse Source
This commit is contained in:
Valmik Jangla 2016-03-10 15:47:03 +05:30 committed by Anand Doshi
parent ba54a43e32
commit e2b8af16ed
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,9 +118,8 @@ class SalarySlip(TransactionBase):
holidays = frappe.db.sql("""select t1.holiday_date holidays = frappe.db.sql("""select t1.holiday_date
from `tabHoliday` t1, `tabHoliday List` t2 from `tabHoliday` t1, `tabHoliday List` t2
where t1.parent = t2.name and t2.is_default = 1 where t1.parent = t2.name and t2.is_default = 1
and t2.fiscal_year = %s
and t1.holiday_date between %s and %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] holidays = [cstr(i[0]) for i in holidays]
return holidays return holidays