vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge branch 'master' into develop

Browse source
This commit is contained in:
Nabin Hait 2016-12-06 16:53:54 +05:30
commit f73e8d0404
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/__init__.py
View file

@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json
from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template
__version__ = '7.1.22'
__version__ = '7.1.23'
__title__ = "Frappe Framework"
local = Local()

2
frappe/patches/v7_0/update_report_builder_json.py
View file

@ -6,7 +6,7 @@ import frappe
def execute():
for report in frappe.db.sql_list(""" select name from `tabReport` where report_type = 'Report Builder'
and is_standard = 'No'"""):
and is_standard = 'No' and `json` != '' and `json` is not null """):
doc = frappe.get_doc("Report", report)
doc.update_report_json()
doc.db_set("json", doc.json, update_modified=False)