Merge branch 'develop'
This commit is contained in:
commit
fcfced624a
@ -1,2 +1,2 @@
|
||||
from __future__ import unicode_literals
|
||||
__version__ = '6.7.5'
|
||||
__version__ = '6.7.6'
|
||||
|
@ -29,7 +29,7 @@ blogs.
|
||||
"""
|
||||
app_icon = "icon-th"
|
||||
app_color = "#e74c3c"
|
||||
app_version = "6.7.5"
|
||||
app_version = "6.7.6"
|
||||
source_link = "https://github.com/frappe/erpnext"
|
||||
|
||||
error_report_email = "support@erpnext.com"
|
||||
|
@ -2,6 +2,7 @@ from __future__ import unicode_literals
|
||||
import frappe
|
||||
|
||||
def execute():
|
||||
frappe.reload_doctype("Leave Allocation")
|
||||
if frappe.db.has_column("Leave Allocation", "fiscal_year"):
|
||||
for leave_allocation in frappe.db.sql("select name, fiscal_year from `tabLeave Allocation`", as_dict=True):
|
||||
dates = frappe.db.get_value("Fiscal Year", leave_allocation["fiscal_year"],
|
||||
|
Loading…
Reference in New Issue
Block a user