Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Fixes] minor fix for fiscal year in holiday list

Browse Source
This commit is contained in:
Saurabh 2015-10-07 11:17:14 +05:30
parent 1d753c92b1
commit 74eb8e34da
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,6 +78,9 @@ def get_events(start, end, filters=None):
if filters: if filters:
fiscal_year = json.loads(filters).get("fiscal_year") fiscal_year = json.loads(filters).get("fiscal_year")
if not fiscal_year:
fiscal_year = frappe.get_doc("Global Defaults").current_fiscal_year
yr_start_date, yr_end_date = get_fy_start_end_dates(fiscal_year) yr_start_date, yr_end_date = get_fy_start_end_dates(fiscal_year)
data = frappe.db.sql("""select hl.name, hld.holiday_date, hld.description data = frappe.db.sql("""select hl.name, hld.holiday_date, hld.description
@ -93,9 +96,6 @@ def get_events(start, end, filters=None):
return data return data
def get_fy_start_end_dates(fiscal_year=None): def get_fy_start_end_dates(fiscal_year):
if not fiscal_year:
fiscal_year = frappe.get_doc("Global Defaults").current_fiscal_year
return frappe.db.sql("""select year_start_date, year_end_date return frappe.db.sql("""select year_start_date, year_end_date
from `tabFiscal Year` where name=%s""", (fiscal_year,))[0] from `tabFiscal Year` where name=%s""", (fiscal_year,))[0]