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

[fix] additional fixes for removal of Fiscal Year form Holiday List

Browse Source
This commit is contained in:
Anand Doshi
2016-03-11 17:16:30 +05:30
parent e2b8af16ed
commit 4284fcf2a6
14 changed files with 178 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,6 +9,7 @@ from frappe.utils import add_days, getdate, cint, cstr
from frappe import throw, _
from erpnext.utilities.transaction_base import TransactionBase, delete_events
from erpnext.stock.utils import get_valid_serial_nos
from erpnext.hr.doctype.employee.employee import get_holiday_list_for_employee
class MaintenanceSchedule(TransactionBase):
def generate_schedule(self):
@@ -92,22 +93,19 @@ class MaintenanceSchedule(TransactionBase):
def validate_schedule_date_for_holiday_list(self, schedule_date, sales_person):
validated = False
# check holiday list in employee master
holiday_list = frappe.db.sql_list("""select h.holiday_date from `tabEmployee` emp,
`tabSales Person` sp, `tabHoliday` h, `tabHoliday List` hl
where h.parent=hl.name and sp.name=%s and emp.name=sp.employee
and hl.name=emp.holiday_list
""", (sales_person))
if not holiday_list:
# check global holiday list
holiday_list = frappe.db.sql_list("""select h.holiday_date from
`tabHoliday` h, `tabHoliday List` hl
where h.parent=hl.name and hl.is_default = 1""")
if not validated and holiday_list:
if schedule_date in holiday_list:
schedule_date = add_days(schedule_date, -1)
else:
validated = True
employee = frappe.db.get_value("Sales Person", sales_person, "employee")
holiday_list = get_holiday_list_for_employee(employee)
holidays = frappe.db.sql_list('''select holiday_date from `tabHoliday` where parent=%s''', holiday_list)
if not validated and holidays:
# max iterations = len(holidays)
for i in xrange(len(holidays)):
if schedule_date in holidays:
schedule_date = add_days(schedule_date, -1)
else:
validated = True
break
return schedule_date