diff --git a/README.md b/README.md index a936e160e8..bf42d2bc9a 100644 --- a/README.md +++ b/README.md @@ -31,8 +31,10 @@ You will have to set your origin in git remote ## Forums -- [User / Functional](http://groups.google.com/group/erpnext-user-forum) -- [Technical](http://groups.google.com/group/wnframework) +Please join our forums for more questions: + +- [Developer Forum](http://groups.google.com/group/erpnext-developer-forum) +- [User Forum](http://groups.google.com/group/erpnext-user-forum) ## License diff --git a/erpnext/startup/event_handlers.py b/erpnext/startup/event_handlers.py index f7908c01e3..0c5eae1892 100644 --- a/erpnext/startup/event_handlers.py +++ b/erpnext/startup/event_handlers.py @@ -85,8 +85,8 @@ def boot_session(bootinfo): # load subscription info import conf - if hasattr(conf, 'max_users'): bootinfo['max_users'] = conf.max_users - if hasattr(conf, 'expires_on'): bootinfo['expires_on'] = conf.expires_on + for key in ['max_users', 'expires_on', 'max_space', 'status']: + if hasattr(conf, key): bootinfo[key] = getattr(conf, key) company = webnotes.conn.sql("select name, default_currency from `tabCompany`", as_dict=1) company_dict = {} @@ -95,8 +95,6 @@ def boot_session(bootinfo): bootinfo['company'] = company_dict - - def get_letter_heads(): """load letter heads with startup""" import webnotes