[refactor] fixes

frappe/desk/page/messages/messages.json

@@ -6,7 +6,7 @@
  "idx": 1,
  "modified": "2013-07-11 14:43:32.000001",
  "modified_by": "Administrator",
- "module": "Desk Apps",
+ "module": "Desk",
  "name": "messages",
  "owner": "Administrator",
  "page_name": "messages",

frappe/modules.txt

@@ -4,5 +4,5 @@ Workflow
 Email
 Custom
 Geo
-Desk Apps
-Print
+Desk
+Print

frappe/modules/import_file.py

@@ -66,7 +66,11 @@ def read_doc_from_file(path):
 	doc = None
 	if os.path.exists(path):
 		with open(path, 'r') as f:
-			doc = json.loads(f.read())
+			try:
+				doc = json.loads(f.read())
+			except ValueError:
+				print "bad json: {0}".format(path)
+				raise
 	else:
 		raise Exception, '%s missing' % path
 

frappe/patches.txt

@@ -9,6 +9,7 @@ execute:frappe.reload_doc('core', 'doctype', 'email_alert') #2014-07-15
 execute:frappe.db.sql("alter table `tabSessions` modify `user` varchar(255), engine=InnoDB")
 execute:frappe.db.sql("delete from `tabDocField` where parent='0'")
 frappe.patches.v4_0.change_varchar_length
+frappe.patches.v5_0.v4_to_v5
 
 frappe.patches.v4_0.webnotes_to_frappe
 execute:frappe.reset_perms("Module Def")

frappe/print/doctype/print_format/print_format.json

@@ -1,5 +1,5 @@
 {
-  "allow_copy": 0,
+ "allow_copy": 0,
  "allow_rename": 0,
  "autoname": "Prompt",
  "creation": "2013-01-23 19:54:43",
@@ -148,7 +148,7 @@
    "report": 1,
    "role": "System Manager",
    "submit": 0
-  },
+  }
  ],
  "read_only": 0,
  "read_only_onload": 0,