diff --git a/cgi-bin/core/doctype/doctype_mapper/doctype_mapper.py b/cgi-bin/core/doctype/doctype_mapper/doctype_mapper.py
index 89cf74efae..05b136de11 100644
--- a/cgi-bin/core/doctype/doctype_mapper/doctype_mapper.py
+++ b/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])
diff --git a/cgi-bin/webnotes/defs_template.py b/cgi-bin/webnotes/defs_template.py
index 80e3113129..823edc0356 100644
--- a/cgi-bin/webnotes/defs_template.py
+++ b/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
#
diff --git a/cgi-bin/webnotes/install_lib/install.py b/cgi-bin/webnotes/install_lib/install.py
index 68c9fbd2fa..c22dcdcb6f 100755
--- a/cgi-bin/webnotes/install_lib/install.py
+++ b/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
diff --git a/cgi-bin/webnotes/modules/patch.py b/cgi-bin/webnotes/modules/patch.py
index 5ecd84446c..4ead5121b0 100644
--- a/cgi-bin/webnotes/modules/patch.py
+++ b/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 + '
Login User: ' + webnotes.user.name + '
' + 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 + '
Login User: ' + webnotes.user.name + '
' + webnotes.getTraceback()
+ sendmail(['developers@erpnext.com'], sender='automail@erpnext.com', subject= subj, parts=[['text/plain', msg]])
diff --git a/cgi-bin/webnotes/utils/scheduler.py b/cgi-bin/webnotes/utils/scheduler.py
index 7caa1fd6ee..879063a1d2 100644
--- a/cgi-bin/webnotes/utils/scheduler.py
+++ b/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)
diff --git a/images/icons/folder.gif b/images/icons/folder.gif
deleted file mode 100644
index 45b191d8ae..0000000000
Binary files a/images/icons/folder.gif and /dev/null differ
diff --git a/images/icons/icons.png b/images/icons/icons.png
deleted file mode 100644
index fac6f173f0..0000000000
Binary files a/images/icons/icons.png and /dev/null differ
diff --git a/images/icons/wntoolbar-icons.png b/images/icons/wntoolbar-icons.png
deleted file mode 100644
index 1e17e11593..0000000000
Binary files a/images/icons/wntoolbar-icons.png and /dev/null differ
diff --git a/images/ui/rc/comment_top.gif b/images/ui/rc/comment_top.gif
deleted file mode 100644
index 4efd7147e5..0000000000
Binary files a/images/ui/rc/comment_top.gif and /dev/null differ
diff --git a/images/ui/rc/tab-left-CCC.gif b/images/ui/rc/tab-left-CCC.gif
deleted file mode 100644
index f6f3a545b8..0000000000
Binary files a/images/ui/rc/tab-left-CCC.gif and /dev/null differ
diff --git a/images/ui/rc/tab-left-EEE.gif b/images/ui/rc/tab-left-EEE.gif
deleted file mode 100644
index f04d0c6b97..0000000000
Binary files a/images/ui/rc/tab-left-EEE.gif and /dev/null differ
diff --git a/images/ui/rc/tab-right-CCC.gif b/images/ui/rc/tab-right-CCC.gif
deleted file mode 100644
index 9995e00278..0000000000
Binary files a/images/ui/rc/tab-right-CCC.gif and /dev/null differ
diff --git a/images/ui/rc/tab-right-EEE.gif b/images/ui/rc/tab-right-EEE.gif
deleted file mode 100644
index 0dd0d03b99..0000000000
Binary files a/images/ui/rc/tab-right-EEE.gif and /dev/null differ
diff --git a/images/ui/rc/tb-left-bottom.gif b/images/ui/rc/tb-left-bottom.gif
deleted file mode 100644
index e9c4be326a..0000000000
Binary files a/images/ui/rc/tb-left-bottom.gif and /dev/null differ
diff --git a/images/ui/rc/tb-right-bottom.gif b/images/ui/rc/tb-right-bottom.gif
deleted file mode 100644
index a49e00012b..0000000000
Binary files a/images/ui/rc/tb-right-bottom.gif and /dev/null differ
diff --git a/images/ui/rc/tray-left-bottom.gif b/images/ui/rc/tray-left-bottom.gif
deleted file mode 100644
index 46c0e43a7c..0000000000
Binary files a/images/ui/rc/tray-left-bottom.gif and /dev/null differ
diff --git a/images/ui/rc/tray-left-top.gif b/images/ui/rc/tray-left-top.gif
deleted file mode 100644
index 171db8e4c9..0000000000
Binary files a/images/ui/rc/tray-left-top.gif and /dev/null differ
diff --git a/js/app.js b/js/app.js
index 38231c5bb5..641554aca7 100644
--- a/js/app.js
+++ b/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