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-06-08 16:15:38 +05:30
commit 563eb9c43b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -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

6
erpnext/startup/event_handlers.py
View File

@ -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