Merge branch 'stable' into live

cgi-bin/core/doctype/doctype/doctype.py

@@ -83,7 +83,7 @@ class DocType:
 		from webnotes import defs
 		from webnotes.utils.transfer import in_transfer
 
-		if (not in_transfer) and getattr(defs,'developer_mode', 0):
+		if (not in_transfer) and getattr(webnotes.defs,'developer_mode', 0):
 			self.export_doc()
 		sql("delete from __DocTypeCache")
 		

cgi-bin/webnotes/utils/scheduler.py

@@ -138,7 +138,7 @@ class Scheduler:
 			
 			# if recurring, update next_execution
 			if e['recurring']:
-				self.conn.sql("update Event set next_execution = addtime(now(), sec_to_time(%s))", e['interval'])
+				self.conn.sql("update Event set next_execution = addtime(now(), sec_to_time(%s)) where event=%s", (e['interval'], e['event']))
 			
 			# else clear
 			else: