Merge branch 'handlerupdate' into sync_handler_merge

Conflicts: js/all-app.js version.num
2012-03-23 13:55:20 +05:30
parent 71d0b2a428 d9831e9073
commit 9b56a8ada9
174 changed files with 3572 additions and 7736 deletions
--- a/erpnext/startup/event_handlers.py
+++ b/erpnext/startup/event_handlers.py
@@ -89,6 +89,7 @@ def boot_session(bootinfo):

 		import webnotes.model.doctype
 		bootinfo['docs'] += webnotes.model.doctype.get('Event')
+		bootinfo['docs'] += webnotes.model.doctype.get('Search Criteria')
 		
 		bootinfo['modules_list'] = webnotes.conn.get_global('modules_list')