nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-18 12:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Nabin Hait
2015-07-30 16:47:49 +05:30
parent b75f5fd5ab 69588f57e7
commit 75e9733283
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__version__.py
View File

@@ -1,2 +1,2 @@
from __future__ import unicode_literals from __future__ import unicode_literals
__version__ = '5.4.1' __version__ = '5.4.2'

2
erpnext/hooks.py
View File

@@ -27,7 +27,7 @@ blogs.
""" """
app_icon = "icon-th" app_icon = "icon-th"
app_color = "#e74c3c" app_color = "#e74c3c"
app_version = "5.4.1" app_version = "5.4.2"
github_link = "https://github.com/frappe/erpnext" github_link = "https://github.com/frappe/erpnext"
error_report_email = "support@erpnext.com" error_report_email = "support@erpnext.com"

2
erpnext/manufacturing/doctype/production_order/production_order.js
View File

@@ -250,7 +250,7 @@ cur_frm.fields_dict['production_item'].get_query = function(doc) {
return { return {
filters:[ filters:[
['Item', 'is_pro_applicable', '=', 1], ['Item', 'is_pro_applicable', '=', 1],
['Item', 'has_variants', '=', 0] ['Item', 'has_variants', '=', 0],
['Item', 'end_of_life', '>=', frappe.datetime.nowdate()] ['Item', 'end_of_life', '>=', frappe.datetime.nowdate()]
] ]
} }

2
setup.py
View File

@@ -1,6 +1,6 @@
from setuptools import setup, find_packages from setuptools import setup, find_packages
version = "5.4.1" version = "5.4.2"
with open("requirements.txt", "r") as f: with open("requirements.txt", "r") as f:
install_requires = f.readlines() install_requires = f.readlines()