Merge branch 'master' into dev

2012-07-12 23:38:45 +05:30 · 2012-07-12 23:38:45 +05:30 · 4a56e996f1
commit 4a56e996f1
parent c97f780940 4659b1eb25
1 changed files with 5 additions and 1 deletions
--- a/erpnext/patches/june_2012/cms2.py
+++ b/erpnext/patches/june_2012/cms2.py
@ -66,10 +66,14 @@ def save_pages():

 	import webnotes
 	from webnotes.model.doclist import DocList
+	import webnotes.modules.patch_handler

 	for dt in query_map:
 		for result in webnotes.conn.sql(query_map[dt], as_dict=1):
-			DocList(dt, result['name']).save()
+			try:
+				DocList(dt, result['name']).save()
+			except Exception, e:
+				webnotes.modules.patch_handler.log(str(e))
 			
 def save_website_settings():
 	from webnotes.model.code import get_obj