fix(modules): Merge Settings into one, Setup --> Settings

erpnext/config/accounting.py

@@ -108,7 +108,7 @@ def get_data():
 
 		},
 		{
-			"label": _("Setup"),
+			"label": _("Settings"),
 			"icon": "fa fa-cog",
 			"items": [
 				{

erpnext/config/buying.py

@@ -78,7 +78,7 @@ def get_data():
 			]
 		},
 		{
-			"label": _("Setup"),
+			"label": _("Settings"),
 			"icon": "fa fa-cog",
 			"items": [
 				{

erpnext/config/crm.py

@@ -106,7 +106,7 @@ def get_data():
 			]
 		},
 		{
-			"label": _("Setup"),
+			"label": _("Settings"),
 			"icon": "fa fa-cog",
 			"items": [
 				{

erpnext/config/desktop.py

@@ -225,15 +225,4 @@ def get_data():
 			'standard': 1,
 			"description": "Publish items to other ERPNext users and start a conversation."
 		},
-		{
-			"module_name": "Settings",
-			"category": "Administration",
-			"label": _("Settings"),
-			"color": "#bdc3c7",
-			"reverse": 1,
-			"icon": "octicon octicon-settings",
-			"type": "module",
-			"hidden": 1,
-			"description": "Global settings for all modules in ERPNext, with Email Digest and SMS."
-		},
 	]

erpnext/config/education.py

@@ -198,7 +198,7 @@ def get_data():
 			]
 		},
 		{
-			"label": _("Setup"),
+			"label": _("Settings"),
 			"items": [
 				{
 					"type": "doctype",

erpnext/config/healthcare.py

@@ -105,7 +105,7 @@ def get_data():
 			]
 		},
 		{
-			"label": _("Setup"),
+			"label": _("Settings"),
 			"icon": "icon-cog",
 			"items": [
 				{

erpnext/config/help.py

@@ -30,7 +30,7 @@ def get_data():
 
 		},
 		{
-			"label": _("Setup"),
+			"label": _("Settings"),
 			"items": [
 				{
 					"type": "help",

erpnext/config/hr.py

@@ -106,7 +106,7 @@ def get_data():
 			]
 		},
 		{
-			"label": _("Setup"),
+			"label": _("Settings"),
 			"icon": "fa fa-cog",
 			"items": [
 				{

erpnext/config/hub_node.py

@@ -4,7 +4,7 @@ from frappe import _
 def get_data():
 	return [
 		{
-			"label": _("Setup"),
+			"label": _("Settings"),
 			"items": [
 				{
 					"type": "doctype",

erpnext/config/manufacturing.py

@@ -97,7 +97,7 @@ def get_data():
 			]
 		},
 		{
-			"label": _("Setup"),
+			"label": _("Settings"),
 			"items": [
 				{
 					"type": "doctype",

erpnext/config/selling.py

@@ -112,7 +112,7 @@ def get_data():
 			]
 		},
 		{
-			"label": _("Setup"),
+			"label": _("Settings"),
 			"icon": "fa fa-cog",
 			"items": [
 				{

erpnext/config/stock.py

@@ -86,7 +86,7 @@ def get_data():
 			]
 		},
 		{
-			"label": _("Setup"),
+			"label": _("Settings"),
 			"icon": "fa fa-cog",
 			"items": [
 				{