From 47b89756d9a09b8c7f139dad497963da80bbee8d Mon Sep 17 00:00:00 2001 From: Valmik Jangla Date: Mon, 28 Mar 2016 12:18:10 +0530 Subject: [PATCH] Fix for Holiday List in Maintenance Schedule --- .../doctype/maintenance_schedule/maintenance_schedule.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py index 0469972935..5fab1ace72 100644 --- a/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +++ b/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py @@ -94,7 +94,11 @@ class MaintenanceSchedule(TransactionBase): validated = False employee = frappe.db.get_value("Sales Person", sales_person, "employee") - holiday_list = get_holiday_list_for_employee(employee) + if employee: + holiday_list = get_holiday_list_for_employee(employee) + else: + holiday_list = frappe.db.get_value("Company", self.company, "default_holiday_list") + holidays = frappe.db.sql_list('''select holiday_date from `tabHoliday` where parent=%s''', holiday_list) if not validated and holidays: