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/accounts.py
+++ b/erpnext/config/accounts.py
@@ -561,10 +561,6 @@ def get_data():
 		"label": _("Subscription Management"),
 		"icon": "fa fa-microchip ",
 		"items": [
-			{
-				"type": "doctype",
-				"name": "Subscriber",
-			},
 			{
 				"type": "doctype",
 				"name": "Subscription Plan",