Merge branch 'develop'
This commit is contained in:
commit
75e9733283
@ -1,2 +1,2 @@
|
||||
from __future__ import unicode_literals
|
||||
__version__ = '5.4.1'
|
||||
__version__ = '5.4.2'
|
||||
|
@ -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"
|
||||
|
@ -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()]
|
||||
]
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user