Merge branch 'master' into dev

This commit is contained in:
Anand Doshi 2012-07-12 23:38:45 +05:30
commit 4a56e996f1

View File

@ -66,10 +66,14 @@ def save_pages():
import webnotes import webnotes
from webnotes.model.doclist import DocList from webnotes.model.doclist import DocList
import webnotes.modules.patch_handler
for dt in query_map: for dt in query_map:
for result in webnotes.conn.sql(query_map[dt], as_dict=1): 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(): def save_website_settings():
from webnotes.model.code import get_obj from webnotes.model.code import get_obj