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

This commit is contained in:
Rushabh Mehta
2013-09-05 19:25:23 +05:30
3 changed files with 21 additions and 19 deletions

View File

@@ -33,8 +33,9 @@ def boot_session(bootinfo):
# load subscription info
import conf
for key in ['max_users', 'expires_on', 'max_space', 'status', 'developer_mode']:
if hasattr(conf, key): bootinfo[key] = getattr(conf, key)
for key in ['max_users', 'expires_on', 'max_space', 'status', 'developer_mode',
'commercial_support']:
if hasattr(conf, key): bootinfo[key] = getattr(conf, key)
bootinfo['docs'] += webnotes.conn.sql("""select name, default_currency, cost_center
from `tabCompany`""", as_dict=1, update={"doctype":":Company"})