diff --git a/config.json b/config.json index 030af312c3..a36e2aada9 100644 --- a/config.json +++ b/config.json @@ -1,6 +1,6 @@ { "base_template": "lib/website/templates/base.html", - "framework_version": "3.4.2", + "framework_version": "3.4.3", "modules": { "Calendar": { "color": "#2980b9", diff --git a/public/css/common.css b/public/css/common.css index 1dc627f4a3..2d5f9dad18 100644 --- a/public/css/common.css +++ b/public/css/common.css @@ -572,4 +572,7 @@ ul.linked-with-list li { } /* hack */ -.ui-datepicker { z-index: 9999999 !important; } +.ui-datepicker, +.ui-autocomplete { + z-index: 9999999 !important; +} diff --git a/webnotes/widgets/reportview.py b/webnotes/widgets/reportview.py index c6c7ffe97b..656d2fa21d 100644 --- a/webnotes/widgets/reportview.py +++ b/webnotes/widgets/reportview.py @@ -169,12 +169,14 @@ def build_filter_conditions(filters, conditions): if isinstance(f, basestring): conditions.append(f) else: + tname = ('`tab' + f[0] + '`') if not tname in webnotes.local.reportview_tables: webnotes.local.reportview_tables.append(tname) - if not hasattr(webnotes.local, "reportview_doctypes"): - load_doctypes() + if not hasattr(webnotes.local, "reportview_doctypes") \ + or not webnotes.local.reportview_doctypes.has_key(tname): + load_doctypes() # prepare in condition if f[2] in ['in', 'not in']: