Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests 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
Show Stats 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 from __future__ import unicode_literals
import frappe import frappe
from frappe.utils import cint, get_datetime from frappe.utils import cint, getdate
from frappe import throw, _ from frappe import throw, _
from frappe.model.document import Document from frappe.model.document import Document
@ -59,7 +59,6 @@ class HolidayList(Document):
def get_weekly_off_date_list(self, start_date, end_date): 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) start_date, end_date = getdate(start_date), getdate(end_date)
from dateutil import relativedelta from dateutil import relativedelta
@ -71,8 +70,7 @@ class HolidayList(Document):
weekday = getattr(calendar, (self.weekly_off).upper()) weekday = getattr(calendar, (self.weekly_off).upper())
reference_date = start_date + relativedelta.relativedelta(weekday=weekday) reference_date = start_date + relativedelta.relativedelta(weekday=weekday)
for holiday in self.get("holidays"): existing_date_list = [getdate(holiday.holiday_date) for holiday in self.get("holidays")]
existing_date_list.append(get_datetime(holiday.holiday_date).date())
while reference_date <= end_date: while reference_date <= end_date:
if reference_date not in existing_date_list: if reference_date not in existing_date_list:

21
erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py
View File

@ -90,30 +90,19 @@ class MaintenanceSchedule(TransactionBase):
return schedule_list return schedule_list
def validate_schedule_date_for_holiday_list(self, schedule_date, sales_person): def validate_schedule_date_for_holiday_list(self, schedule_date, sales_person):
from erpnext.accounts.utils import get_fiscal_year
validated = False validated = False
fy_details = ""
try:
fy_details = get_fiscal_year(date=schedule_date, verbose=0)
except Exception:
pass
if fy_details and fy_details[0]:
# check holiday list in employee master # check holiday list in employee master
holiday_list = frappe.db.sql_list("""select h.holiday_date from `tabEmployee` emp, holiday_list = frappe.db.sql_list("""select h.holiday_date from `tabEmployee` emp,
`tabSales Person` sp, `tabHoliday` h, `tabHoliday List` hl `tabSales Person` sp, `tabHoliday` h, `tabHoliday List` hl
where sp.name=%s and emp.name=sp.employee where h.parent=hl.name and sp.name=%s and emp.name=sp.employee
and hl.name=emp.holiday_list and and hl.name=emp.holiday_list
h.parent=hl.name and """, (sales_person))
hl.fiscal_year=%s""", (sales_person, fy_details[0]))
if not holiday_list: if not holiday_list:
# check global holiday list # check global holiday list
holiday_list = frappe.db.sql("""select h.holiday_date from holiday_list = frappe.db.sql_list("""select h.holiday_date from
`tabHoliday` h, `tabHoliday List` hl `tabHoliday` h, `tabHoliday List` hl
where h.parent=hl.name and hl.is_default = 1 where h.parent=hl.name and hl.is_default = 1""")
and hl.fiscal_year=%s""", fy_details[0])
if not validated and holiday_list: if not validated and holiday_list:
if schedule_date in holiday_list: if schedule_date in holiday_list:
schedule_date = add_days(schedule_date, -1) schedule_date = add_days(schedule_date, -1)