Merge branch 'develop' of https://github.com/frappe/erpnext into develop
diff --git a/erpnext/config/crm.py b/erpnext/config/crm.py
index eba6c7a..0501784 100644
--- a/erpnext/config/crm.py
+++ b/erpnext/config/crm.py
@@ -46,6 +46,11 @@
"name": "Contract",
"description": _("Helps you keep tracks of Contracts based on Supplier, Customer and Employee"),
},
+ {
+ "type": "doctype",
+ "name": "Newsletter",
+ "label": _("Newsletter"),
+ }
]
},
{
@@ -165,6 +170,11 @@
"type": "doctype",
"name": "SMS Settings",
"description": _("Setup SMS gateway settings")
+ },
+ {
+ "type": "doctype",
+ "label": _("Email Group"),
+ "name": "Email Group",
}
]
},