From a7bd8ee34b12365564e8216a2bd4668d12e7a553 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 20 May 2015 12:53:04 +0530 Subject: [PATCH 1/2] Update utils.py --- erpnext/accounts/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py index 3ae36c18f9..b5056d7e9f 100644 --- a/erpnext/accounts/utils.py +++ b/erpnext/accounts/utils.py @@ -20,9 +20,9 @@ def get_fiscal_years(transaction_date=None, fiscal_year=None, label="Date", verb # if year start date is 2012-04-01, year end date should be 2013-03-31 (hence subdate) cond = " ifnull(disabled, 0) = 0" if fiscal_year: - cond = " and fy.name = %(fiscal_year)s" + cond += " and fy.name = %(fiscal_year)s" else: - cond = " and %(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) From 10e813b0103c86afe9dacfb3c0d90dea255798b6 Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Wed, 20 May 2015 13:24:52 +0600 Subject: [PATCH 2/2] bumped to version 5.0.5 --- erpnext/__version__.py | 2 +- erpnext/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/__version__.py b/erpnext/__version__.py index 54d8de2063..7d2298fb00 100644 --- a/erpnext/__version__.py +++ b/erpnext/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = '5.0.4' +__version__ = '5.0.5' diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 483172aa74..aa8638e63a 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -5,7 +5,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd. and Contributors" app_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations" app_icon = "icon-th" app_color = "#e74c3c" -app_version = "5.0.4" +app_version = "5.0.5" error_report_email = "support@erpnext.com" diff --git a/setup.py b/setup.py index ad111d6dc8..669c90190f 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ from setuptools import setup, find_packages -version = "5.0.4" +version = "5.0.5" with open("requirements.txt", "r") as f: install_requires = f.readlines()