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

Merge pull request #5077 from frappe/master

Browse Source 
Master
This commit is contained in:
Rushabh Mehta
2016-03-29 11:59:32 +05:30
parent 3117b4b8d6 4ccf692f7c
commit c9850f9e04
7 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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: