Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes

2018-12-27 09:05:25 +05:30
parent 19f8e6bcf8 9e09b3adbe
commit 3de12db2b1
142 changed files with 7011 additions and 1132 deletions
--- a/erpnext/config/desktop.py
+++ b/erpnext/config/desktop.py
@@ -572,5 +572,12 @@ def get_data():
 			"type": "module",
 			"label": _("Non Profit"),
 			"hidden": 1
+		},
+		{
+			"module_name": "Quality Management",
+			"color": "blue",
+			"icon": "octicon octicon-package",
+			"type": "module",
+			"label": _("Quality Management")
 		}
 	]