Merge branch 'hotfix'

frappe/__init__.py

@@ -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.0.31"
+__version__ = "7.0.32"
 
 local = Local()
 

frappe/patches/v7_0/cleanup_list_settings.py

@@ -7,6 +7,8 @@ def execute():
 	for ls in list_settings:
 		if ls and ls.data:
 			data = json.loads(ls.data)
+			if not data.has_key("fields"):
+				continue
 			fields = data["fields"]
 			for field in fields:
 				if "name as" in field:
@@ -15,4 +17,4 @@ def execute():
 			
 			frappe.db.sql("update __ListSettings set data = %s where user=%s and doctype=%s", 
 				(json.dumps(data), ls.user, ls.doctype))
-		
+