Browse Source

Merge branch 'develop'

version-14
Pratik Vyas 11 years ago
parent
commit
60093c845b
2 changed files with 4 additions and 1 deletions
  1. +1
    -1
      config.json
  2. +3
    -0
      webnotes/widgets/reportview.py

+ 1
- 1
config.json View File

@@ -1,6 +1,6 @@
{ {
"base_template": "lib/website/templates/base.html", "base_template": "lib/website/templates/base.html",
"framework_version": "3.4.1",
"framework_version": "3.4.2",
"modules": { "modules": {
"Calendar": { "Calendar": {
"color": "#2980b9", "color": "#2980b9",


+ 3
- 0
webnotes/widgets/reportview.py View File

@@ -172,6 +172,9 @@ def build_filter_conditions(filters, conditions):
tname = ('`tab' + f[0] + '`') tname = ('`tab' + f[0] + '`')
if not tname in webnotes.local.reportview_tables: if not tname in webnotes.local.reportview_tables:
webnotes.local.reportview_tables.append(tname) webnotes.local.reportview_tables.append(tname)
if not hasattr(webnotes.local, "reportview_doctypes"):
load_doctypes()
# prepare in condition # prepare in condition
if f[2] in ['in', 'not in']: if f[2] in ['in', 'not in']:


Loading…
Cancel
Save