Merge branch 'version-12-hotfix' into release-notes-fixes
diff --git a/erpnext/setup/doctype/item_group/item_group.py b/erpnext/setup/doctype/item_group/item_group.py
index 8fbeac8..cab2116 100644
--- a/erpnext/setup/doctype/item_group/item_group.py
+++ b/erpnext/setup/doctype/item_group/item_group.py
@@ -69,8 +69,7 @@
 			"items": get_product_list_for_group(product_group = self.name, start=start,
 				limit=context.page_length + 1, search=frappe.form_dict.get("search")),
 			"parents": get_parent_item_groups(self.parent_item_group),
-			"title": self.name,
-			"products_as_list": cint(frappe.db.get_single_value('Products Settings', 'products_as_list'))
+			"title": self.name
 		})
 
 		if self.slideshow:
diff --git a/erpnext/setup/install.py b/erpnext/setup/install.py
index 03da833..5e85f7d 100644
--- a/erpnext/setup/install.py
+++ b/erpnext/setup/install.py
@@ -22,6 +22,7 @@
 	add_all_roles_to("Administrator")
 	create_default_cash_flow_mapper_templates()
 	create_default_success_action()
+	add_company_to_session_defaults()
 	frappe.db.commit()
 
 
@@ -84,3 +85,10 @@
 		if not frappe.db.exists('Success Action', success_action.get("ref_doctype")):
 			doc = frappe.get_doc(success_action)
 			doc.insert(ignore_permissions=True)
+
+def add_company_to_session_defaults():
+	settings = frappe.get_single("Session Default Settings")
+	settings.append("session_defaults", {
+		"ref_doctype": "Company"
+	})
+	settings.save()