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

setup/doctype/sales_person/test_sales_person.py

@@ -4,5 +4,19 @@ test_records = [
 		"sales_person_name": "_Test Sales Person",
 		"parent_sales_person": "All Sales Persons",
 		"is_group": "No"
+	}],
+	[{
+		"doctype": "Sales Person",
+		"sales_person_name": "_Test Sales Person 1",
+		"parent_sales_person": "All Sales Persons",
+		"is_group": "No"
+	}],
+	[{
+		"doctype": "Sales Person",
+		"sales_person_name": "_Test Sales Person 2",
+		"parent_sales_person": "All Sales Persons",
+		"is_group": "No"
 	}]
+	
+	
 ]

setup/doctype/setup_control/setup_control.py

@@ -97,7 +97,7 @@ class DocType:
 		self.create_email_digest()
 
 		webnotes.clear_cache()
-		msgprint("Company setup is complete")
+		msgprint("Company setup is complete. Please refresh the page before continuing.")
 		
 		import webnotes.utils
 		user_fullname = (args.get('first_name') or '') + (args.get('last_name')

setup/page/setup/setup.js

@@ -45,7 +45,7 @@ wn.module_page["Setup"] = [
 			},
 			{
 				"doctype":"Workflow",
-				label:wn._("Workfow"),
+				label:wn._("Workflow"),
 				"description":wn._("Set workflow rules.")
 			},
 			{
@@ -98,12 +98,6 @@ wn.module_page["Setup"] = [
 				label:wn._("Print Heading"),
 				"description":wn._("Add headers for standard print formats")
 			},
-			{
-				"route":"Form/Style Settings/Style Settings",
-				doctype:wn._("Style Settings"),
-				label:wn._("Style Settings"),
-				"description":wn._("Change background fonts etc")
-			}
 		]
 	},
 	{