nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-05 22:48:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	accounts/doctype/account/account.py
	erpnext/accounts/doctype/journal_voucher/journal_voucher.py
	patches/patch_list.py
	startup/event_handlers.py
This commit is contained in:
Anand Doshi
2012-10-02 14:35:20 +05:30
parent 5bc86087fd 47d8947012
commit 05aaae33ae
20 changed files with 287 additions and 503 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
startup/event_handlers.py
View File

@@ -118,8 +118,7 @@ def check_if_expired():
# if expired, stop user from logging in
from webnotes.utils import formatdate
msg = """Oops! Your subscription expired on <b>%s</b>.
<br>Nothing catastrophic.<br>""" % formatdate(conf.expires_on)
msg = """Oops! Your subscription expired on <b>%s</b>.<br>""" % formatdate(conf.expires_on)
if 'System Manager' in webnotes.user.roles:
msg += """Just drop in a mail at <b>support@erpnext.com</b> and