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

Fixed Maintenance Schedule to work wit new Holiday List

Browse Source 
Improved code in Holiday List for speed
This commit is contained in:
Valmik Jangla
2016-03-09 16:09:53 +05:30
committed by Anand Doshi
parent 3427c939bd
commit ba54a43e32
2 changed files with 18 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/hr/doctype/holiday_list/holiday_list.py
View File

@@ -4,7 +4,7 @@
from __future__ import unicode_literals
import frappe
from frappe.utils import cint, get_datetime
from frappe.utils import cint, getdate
from frappe import throw, _
from frappe.model.document import Document
@@ -59,7 +59,6 @@ class HolidayList(Document):
def get_weekly_off_date_list(self, start_date, end_date):
from frappe.utils import getdate
start_date, end_date = getdate(start_date), getdate(end_date)
from dateutil import relativedelta
@@ -71,8 +70,7 @@ class HolidayList(Document):
weekday = getattr(calendar, (self.weekly_off).upper())
reference_date = start_date + relativedelta.relativedelta(weekday=weekday)
for holiday in self.get("holidays"):
existing_date_list.append(get_datetime(holiday.holiday_date).date())
existing_date_list = [getdate(holiday.holiday_date) for holiday in self.get("holidays")]
while reference_date <= end_date:
if reference_date not in existing_date_list: