From c330a49e9dc937da619b85a040aef9cd92a51faf Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 30 Jul 2015 16:45:58 +0530 Subject: [PATCH 1/2] [hotfix] item search in production order --- .../manufacturing/doctype/production_order/production_order.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/manufacturing/doctype/production_order/production_order.js b/erpnext/manufacturing/doctype/production_order/production_order.js index 60b4918f9a..8202f43759 100644 --- a/erpnext/manufacturing/doctype/production_order/production_order.js +++ b/erpnext/manufacturing/doctype/production_order/production_order.js @@ -250,7 +250,7 @@ cur_frm.fields_dict['production_item'].get_query = function(doc) { return { filters:[ ['Item', 'is_pro_applicable', '=', 1], - ['Item', 'has_variants', '=', 0] + ['Item', 'has_variants', '=', 0], ['Item', 'end_of_life', '>=', frappe.datetime.nowdate()] ] } From 69588f57e7a1ac712eb864833f95688e70ab3997 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 30 Jul 2015 17:17:48 +0600 Subject: [PATCH 2/2] bumped to version 5.4.2 --- 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 9ce5576faf..51138b4f8e 100644 --- a/erpnext/__version__.py +++ b/erpnext/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = '5.4.1' +__version__ = '5.4.2' diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 227206f73c..ee6829d33c 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -27,7 +27,7 @@ blogs. """ app_icon = "icon-th" app_color = "#e74c3c" -app_version = "5.4.1" +app_version = "5.4.2" github_link = "https://github.com/frappe/erpnext" error_report_email = "support@erpnext.com" diff --git a/setup.py b/setup.py index 3e719ca7cc..1c8f758274 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ from setuptools import setup, find_packages -version = "5.4.1" +version = "5.4.2" with open("requirements.txt", "r") as f: install_requires = f.readlines()