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

erpnext/config/desktop.py

@@ -575,9 +575,9 @@ def get_data():
 		},
 		{
 			"module_name": "Quality Management",
-			"color": "blue",
-			"icon": "octicon octicon-package",
+			"color": "#1abc9c",
+			"icon": "fa fa-check-square-o",
 			"type": "module",
-			"label": _("Quality Management")
+			"label": _("Quality")
 		}
-	]
+	]

erpnext/patches.txt

@@ -580,6 +580,7 @@ erpnext.patches.v11_0.update_delivery_trip_status
 erpnext.patches.v10_0.repost_gle_for_purchase_receipts_with_rejected_items
 erpnext.patches.v11_0.set_missing_gst_hsn_code
 erpnext.patches.v11_0.rename_bom_wo_fields
+erpnext.patches.v12_0.change_qms_icon
 erpnext.patches.v12_0.rename_learn_to_help
 erpnext.patches.v12_0.rename_accounts_desktop_icon_to_accounting
 erpnext.patches.v12_0.replace_project_list_desktop_icon_with_projects_module_desktop_icon

erpnext/patches/v12_0/change_qms_icon.py

@@ -0,0 +1,10 @@
+import frappe
+
+def execute():
+	qms_icons = frappe.get_all("Desktop Icon", filters={
+		"module_name": "Quality Management"
+	})
+
+	for icon in qms_icons:
+		frappe.db.set_value('Desktop Icon', icon.name, 'color', '#1abc9c')
+		frappe.db.set_value('Desktop Icon', icon.name, 'icon', 'fa fa-check-square-o')

erpnext/patches/v12_0/rename_quality_management_to_quality.py

@@ -0,0 +1,10 @@
+import frappe
+from frappe import _
+
+def execute():
+	quality_management_module_icons = frappe.get_all('Desktop Icon', filters={
+		'module_name': 'Quality Management'
+	}, fields=['name'])
+
+	for icon in quality_management_module_icons:
+		frappe.db.set_value('Desktop Icon', icon.name, 'label', _('Quality'))

erpnext/quality_management/doctype/customer_feedback/test_customer_feedback.py

@@ -28,19 +28,4 @@ def create_feedback():
 
 def get_feedback():
 	feedback = frappe.get_list("Customer Feedback", limit=1)
-	return feedback[0]
-
-#def create_feedback_template():
-#	template = frappe.get_doc({
-#		"doctype": "Customer Feedback Template",
-#		"template": "_Test Customer Feedback Template",
-#		"scope": "Company",
-#		"feedback_parameter": [
-#			{
-#				"parameter": "_Test Customer Feedback Template Parameter",
-#			}
-#		]
-#	})
-#	template_exist = frappe.get_list("Customer Feedback Template", filters={"template": ""+ template.template +""}, fields=["name"])
-#	if len(template_exist) == 0:
-#		template.insert()
+	return feedback[0]