Merge branch 'stable' of github.com:webnotes/wnframework into stable

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

@@ -143,7 +143,12 @@ class DocType:
 		for f in fld_list:
 			if f[2] == 'Yes':
 				if f[0].startswith('eval:'):
-					to_doc.fields[f[1]] = eval(f[0][5:])
+					try:
+						val = eval(f[0][5:])
+					except:
+						val = ''
+						
+					to_doc.fields[f[1]] = val
 				else:
 					to_doc.fields[f[1]] = obj.fields.get(f[0])
 				

cgi-bin/webnotes/defs_template.py

@@ -48,8 +48,26 @@ modules_path = ''
 # saved to the modules folder
 #
 developer_mode = 0
+
+#
+# Auto Clear Cache: If set, automatically clears cache on refresh
+#
+
 auto_cache_clear = 0
 
+#
+# Admin Email Notification: If the admin_email_notification is set, 
+# then only sent notification email from the system
+#
+
+admin_email_notification = 0
+
+#
+# Global Send Email: Global email settings, if 1 then only mail will go from the system
+#
+
+global_send_email = 1
+
 #
 # Time Zone: Useful if your users are across timezones
 #

cgi-bin/webnotes/install_lib/install.py

@@ -119,7 +119,7 @@ class Installer:
 		self.dbman.delete_user(target)
 
 		# create user and db
-		self.dbman.create_user(target,getattr(webnotes.defs,'db_password',None))
+		self.dbman.create_user(target,self.get_db_password(target))
 		if verbose: print "Created user %s" % target
 	
 		# create a database
@@ -173,7 +173,7 @@ def make_scheduler(root_login, root_password, verbose):
 	dbman.delete_user('master_scheduler')
 
 	# create user and db
-	dbman.create_user('master_scheduler', getattr(webnotes.defs,'db_password',None))
+	dbman.create_user('master_scheduler', getattr(webnotes.defs,'scheduler_password',None))
 	if verbose: print "Created user master_scheduler"
 
 	# create a database

cgi-bin/webnotes/modules/patch.py

@@ -31,7 +31,8 @@ def write_log():
 	patch_log.write(('\n\nError in %s:\n' % webnotes.conn.cur_db_name) + webnotes.getTraceback())
 	patch_log.close()
 	
-	from webnotes.utils import sendmail
-	subj = 'Error in running patches in %s' % webnotes.conn.cur_db_name
-	msg = subj + '<br><br>Login User: ' + webnotes.user.name + '<br><br>' + webnotes.getTraceback()
-	sendmail(['developer@erpnext.com'], sender='automail@erpnext.com', subject= subj, parts=[['text/plain', msg]])
+	if getattr(webnotes.defs,'admin_email_notification',0):
+		from webnotes.utils import sendmail
+		subj = 'Error in running patches in %s' % webnotes.conn.cur_db_name
+		msg = subj + '<br><br>Login User: ' + webnotes.user.name + '<br><br>' + webnotes.getTraceback()
+		sendmail(['developers@erpnext.com'], sender='automail@erpnext.com', subject= subj, parts=[['text/plain', msg]])

cgi-bin/webnotes/utils/scheduler.py

@@ -162,7 +162,7 @@ def cancel_event(event):
 if __name__=='__main__':
 	import os,sys
 
-	cgi_bin_path = os.path.sep.join(__file__.split(os.path.sep)[:-3])
+	cgi_bin_path = os.path.sep.join(os.path.abspath(__file__).split(os.path.sep)[:-3])
 
 	sys.path.append(cgi_bin_path)
 

js/app.js

@@ -107,8 +107,7 @@ function startup() {
 		// for debug
 		if(_startup_data.server_messages) msgprint(_startup_data.server_messages);
 	} else {
-		if($i('startup_div'))
-			$c('startup',{},callback,null,1);
+		$c('startup',{},callback,null,1);
 	}
 }
 
@@ -177,17 +176,6 @@ function setup_calendar() {
 
 startup_list.push(setup_calendar);
 
-// ie6 fixed pos fix
-if(isIE6) {
-	var scroll_list = []
-	window.onscroll = function() { 
-		for(var i=0; i<scroll_list.length; i++) {
-			scroll_list[i]();
-		}	
-	}
-}
-window.onload = function() { startup() }
-
 var resize_observers = []
 function set_resize_observer(fn) {
 	if(resize_observers.indexOf(fn)==-1) resize_observers.push(fn);