From 0d5910341011d074af2c3605d5b6d0d5d776fb11 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Fri, 5 Aug 2016 16:00:45 +0530
Subject: [PATCH] [minor] [fixes]

---
 .../doctype/communication/communication.py    |  3 +-
 frappe/email/doctype/newsletter/newsletter.js |  2 +-
 .../email/doctype/newsletter/newsletter.json  | 31 ++++---------------
 3 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/frappe/core/doctype/communication/communication.py b/frappe/core/doctype/communication/communication.py
index 1e43780b2f..74267674cb 100644
--- a/frappe/core/doctype/communication/communication.py
+++ b/frappe/core/doctype/communication/communication.py
@@ -108,7 +108,8 @@ class Communication(Document):
 				self.sender_full_name = self.sender
 				self.sender = None
 			else:
-				validate_email_add(self.sender, throw=True)
+				if self.sent_or_received=='Sent':
+					validate_email_add(self.sender, throw=True)
 
 				sender_name, sender_email = parseaddr(self.sender)
 
diff --git a/frappe/email/doctype/newsletter/newsletter.js b/frappe/email/doctype/newsletter/newsletter.js
index 962bf50f63..2839b9a8ea 100644
--- a/frappe/email/doctype/newsletter/newsletter.js
+++ b/frappe/email/doctype/newsletter/newsletter.js
@@ -2,7 +2,7 @@
 // License: GNU General Public License v3. See license.txt
 
 cur_frm.cscript.refresh = function(doc) {
-	if(erpnext) erpnext.toggle_naming_series();
+	if(window.erpnext) erpnext.toggle_naming_series();
 	if(!doc.__islocal && !cint(doc.email_sent) && !doc.__unsaved
 			&& inList(frappe.boot.user.can_write, doc.doctype)) {
 		cur_frm.add_custom_button(__('Send'), function() {
diff --git a/frappe/email/doctype/newsletter/newsletter.json b/frappe/email/doctype/newsletter/newsletter.json
index e77e978046..7b96fee6d7 100644
--- a/frappe/email/doctype/newsletter/newsletter.json
+++ b/frappe/email/doctype/newsletter/newsletter.json
@@ -10,6 +10,7 @@
  "docstatus": 0, 
  "doctype": "DocType", 
  "document_type": "Other", 
+ "editable_grid": 0, 
  "fields": [
   {
    "allow_on_submit": 0, 
@@ -246,7 +247,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-06-28 17:20:07.227578", 
+ "modified": "2016-08-05 06:26:58.705579", 
  "modified_by": "Administrator", 
  "module": "Email", 
  "name": "Newsletter", 
@@ -254,27 +255,7 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 1, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "All", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 1, 
+   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 0, 
    "delete": 1, 
@@ -287,13 +268,13 @@
    "read": 1, 
    "report": 1, 
    "role": "Newsletter Manager", 
-   "set_user_permissions": 0, 
+   "set_user_permissions": 1, 
    "share": 1, 
    "submit": 0, 
-   "write": 0
+   "write": 1
   }
  ], 
- "quick_entry": 1, 
+ "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
  "sort_order": "ASC",