Merge branch 'develop'

Author: pdvyas

config.json

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

core/report/todo/todo.py

@@ -17,7 +17,7 @@ def execute(filters=None):
 		todo.date and getdate(todo.date) or getdate("1900-01-01")), reverse=True)
 
 	columns = ["ID:Link/ToDo:90", "Priority::60", "Date:Date", "Description::150",
-		"Assigned To/Owner:Link/Profile:120", "Assigned By:Link/Profile:120", "Reference::200"]
+		"Assigned To/Owner:Data:120", "Assigned By:Data:120", "Reference::200"]
 
 	result = []
 	for todo in todo_list:

webnotes/defaults.py

@@ -101,8 +101,8 @@ def clear_default(key=None, value=None, parent=None, name=None):
 
 	if not conditions:
 		raise Exception, "[clear_default] No key specified."
-	
-	webnotes.conn.sql("""delete from tabDefaultValue where %s""" % " and ".join(conditions), values)
+
+	webnotes.conn.sql("""delete from tabDefaultValue where {0}""".format(" and ".join(conditions)), tuple(values))
 	clear_cache()
 
 def get_defaults_for(parent="Control Panel"):