Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix

erpnext/config/selling.py

@@ -10,7 +10,7 @@ def get_data():
 				{
 					"type": "doctype",
 					"name": "Customer",
-					"description": _("Customer database."),
+					"description": _("Customer Database."),
 					"onboard": 1,
 				},
 				{
@@ -34,6 +34,13 @@ def get_data():
 					"onboard": 1,
 					"dependencies": ["Item", "Customer"],
 				},
+				{
+					"type": "doctype",
+					"name": "Blanket Order",
+					"description": _("Blanket Orders from Costumers."),
+					"onboard": 1,
+					"dependencies": ["Item", "Customer"],
+				},
 				{
 					"type": "doctype",
 					"name": "Sales Partner",
@@ -292,6 +299,12 @@ def get_data():
 					"name": "Customers Without Any Sales Transactions",
 					"doctype": "Customer"
 				},
+				{
+					"type": "report",
+					"is_query_report": True,
+					"name": "Sales Partners Commission",
+					"doctype": "Customer"
+				}
 			]
 		},
 		{

erpnext/config/settings.py

@@ -90,12 +90,6 @@ def get_data():
 			"label": _("Email"),
 			"icon": "fa fa-envelope",
 			"items": [
-				{
-					"type": "doctype",
-					"name": "Feedback Trigger",
-					"label": _("Feedback Trigger"),
-					"description": _("Automatically triggers the feedback request based on conditions.")
-				},
 				{
 					"type": "doctype",
 					"name": "Email Digest",