Merge branch 'develop'
diff --git a/erpnext/__version__.py b/erpnext/__version__.py
index e78a8c3..54d8de2 100644
--- a/erpnext/__version__.py
+++ b/erpnext/__version__.py
@@ -1,2 +1,2 @@
from __future__ import unicode_literals
-__version__ = '5.0.3'
+__version__ = '5.0.4'
diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py
index 1853fc9..3ae36c1 100644
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -18,11 +18,11 @@
def get_fiscal_years(transaction_date=None, fiscal_year=None, label="Date", verbose=1, company=None):
# if year start date is 2012-04-01, year end date should be 2013-03-31 (hence subdate)
- cond = ""
+ cond = " ifnull(disabled, 0) = 0"
if fiscal_year:
- cond = "fy.name = %(fiscal_year)s"
+ cond = " and fy.name = %(fiscal_year)s"
else:
- cond = "%(transaction_date)s >= fy.year_start_date and %(transaction_date)s <= fy.year_end_date"
+ cond = " and %(transaction_date)s >= fy.year_start_date and %(transaction_date)s <= fy.year_end_date"
if company:
cond += """ and (not exists(select name from `tabFiscal Year Company` fyc where fyc.parent = fy.name)
@@ -36,7 +36,7 @@
})
if not fy:
- error_msg = _("""{0} {1} not in any Fiscal Year. For more details check {2}.""").format(label, formatdate(transaction_date), "https://erpnext.com/kb/accounts/fiscal-year-error")
+ error_msg = _("""{0} {1} not in any active Fiscal Year. For more details check {2}.""").format(label, formatdate(transaction_date), "https://erpnext.com/kb/accounts/fiscal-year-error")
if verbose==1: frappe.msgprint(error_msg)
raise FiscalYearError, error_msg
return fy
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index ae1bb57..483172a 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -5,7 +5,7 @@
app_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations"
app_icon = "icon-th"
app_color = "#e74c3c"
-app_version = "5.0.3"
+app_version = "5.0.4"
error_report_email = "support@erpnext.com"
diff --git a/setup.py b/setup.py
index 93f31f0..ad111d6 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
from setuptools import setup, find_packages
-version = "5.0.3"
+version = "5.0.4"
with open("requirements.txt", "r") as f:
install_requires = f.readlines()