Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/home/page/profile_settings/profile_settings.py b/home/page/profile_settings/profile_settings.py
index 4aed1ce..8893ff6 100644
--- a/home/page/profile_settings/profile_settings.py
+++ b/home/page/profile_settings/profile_settings.py
@@ -21,7 +21,7 @@
def check_demo():
- demo_user = 'demo@webnotestech.com'
+ demo_user = 'demo@erpnext.com'
if webnotes.session['user']==demo_user:
webnotes.msgprint("Can't change in demo", raise_exception=1)
diff --git a/startup/event_handlers.py b/startup/event_handlers.py
index 573bcc6..4c4e55b 100644
--- a/startup/event_handlers.py
+++ b/startup/event_handlers.py
@@ -26,7 +26,7 @@
update login_from and delete parallel sessions
"""
# Clear previous sessions i.e. logout previous log-in attempts
- exception_list = ['demo@webnotestech.com', 'Administrator', 'Guest']
+ exception_list = ['demo@erpnext.com', 'Administrator', 'Guest']
if webnotes.session['user'] not in exception_list:
sid_list = webnotes.conn.sql("""
DELETE FROM `tabSessions`
@@ -38,7 +38,7 @@
# check if account is expired
check_if_expired()
- if webnotes.session['user'] not in ('Guest', 'demo@webnotestech.com'):
+ if webnotes.session['user'] not in ('Guest', 'demo@erpnext.com'):
# create feed
from webnotes.utils import nowtime
from webnotes.profile import get_user_fullname