[minor] merged with master branch

startup/__init__.py

@@ -21,25 +21,6 @@ from __future__ import unicode_literals
 
 import webnotes
 
-lang_names = {
-	"हिंदी": "hi",
-	"deutsch": "de",
-	"english": "en",
-	"español": "es",
-	"français": "fr",
-	"português": "pt",
-	"português brasileiro": "pt-BR",
-	"nederlands": "nl",
-	"српски":"sr",
-	"தமிழ்": "ta",
-	"hrvatski": "hr",
-	"italiano": "it",
-	"ไทย": "th",
-	"العربية":"ar"
-}
-
-lang_list = ["ar", "de", "en", "es", "fr", "hi", "hr", "it", "nl", "pt-BR", "pt", "th", "sr", "ta"]
-
 product_name = "ERPNext"
 profile_defaults = {
 	"Company": "company",

startup/boot.py

@@ -33,7 +33,7 @@ def boot_session(bootinfo):
 		
 		# load subscription info
 		import conf
-		for key in ['max_users', 'expires_on', 'max_space', 'status', 'developer_mode']:
+		for key in ['max_users', 'expires_on', 'max_space', 'status', 'commercial_support']:
 			if hasattr(conf, key): bootinfo[key] = getattr(conf, key)
 
 		bootinfo['docs'] += webnotes.conn.sql("""select name, default_currency, cost_center

startup/install.py

@@ -64,7 +64,8 @@ def post_import():
 
 def feature_setup():
 	"""save global defaults and features setup"""
-	doc = webnotes.doc("Features Setup", "Features Setup")
+	bean = webnotes.bean("Features Setup", "Features Setup")
+	bean.ignore_permissions = True
 
 	# store value as 1 for all these fields
 	flds = ['fs_item_serial_nos', 'fs_item_batch_nos', 'fs_brands', 'fs_item_barcode',
@@ -74,8 +75,8 @@ def feature_setup():
 		'fs_recurring_invoice', 'fs_pos', 'fs_manufacturing', 'fs_quality',
 		'fs_page_break', 'fs_more_info', 'fs_pos_view'
 	]
-	doc.fields.update(dict(zip(flds, [1]*len(flds))))
-	doc.save()
+	bean.doc.fields.update(dict(zip(flds, [1]*len(flds))))
+	bean.save()
 
 def import_country_and_currency():
 	from webnotes.country_info import get_all