Merge branch 'develop'

This commit is contained in:
Pratik Vyas 2014-01-02 17:11:55 +05:30
commit ee15674874
3 changed files with 9 additions and 4 deletions

View file

@ -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",

View file

@ -572,4 +572,7 @@ ul.linked-with-list li {
}
/* hack */
.ui-datepicker { z-index: 9999999 !important; }
.ui-datepicker,
.ui-autocomplete {
z-index: 9999999 !important;
}

View file

@ -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']: