Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Nabin Hait 2012-09-28 16:17:04 +05:30
commit b4422f5850
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
erpnext/startup/event_handlers.py
View File

@ -118,22 +118,16 @@ def check_if_expired():
# if expired, stop user from logging in # if expired, stop user from logging in
from webnotes.utils import formatdate from webnotes.utils import formatdate
msg = """Oops! Your subscription expired on <b>%s</b>.<br>""" % formatdate(conf.expires_on)
if 'System Manager' in webnotes.user.roles: if 'System Manager' in webnotes.user.roles:
webnotes.response['server_messages'] = """Oops! \ msg += """Just drop in a mail at <b>support@erpnext.com</b> and
Your subscription expired on <b>%s</b>. we will guide you to get your account re-activated."""
Nothing catastrophic.
Just drop in a mail at <b>support@erpnext.com</b> and \
we will guide you to get your account re-activated.""" % formatdate(conf.expires_on)
else: else:
webnotes.response['server_messages'] = """Oops! \ msg += """Just ask your System Manager to drop in a mail at <b>support@erpnext.com</b> and
Your subscription expired on <b>%s</b>. we will guide him to get your account re-activated."""
Nothing catastrophic. webnotes.msgprint(msg)
Just ask your System Manager to drop in a mail at <b>support@erpnext.com</b> and \
we will guide him to get your account re-activated.""" % formatdate(conf.expires_on)
webnotes.response['message'] = 'Account Expired' webnotes.response['message'] = 'Account Expired'
raise webnotes.AuthenticationError raise webnotes.AuthenticationError