From acdd5189d1dae3d6d8def6c1ca60f2d558052285 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Fri, 20 Mar 2015 15:52:11 +0530
Subject: [PATCH] [test-fix]

---
 .../newsletter_list/newsletter_list.py        |  4 ++++
 .../newsletter_list/test_newsletter_list.py   | 21 ++++++++++++++++++-
 .../v5_0/convert_stock_reconciliation.py      | 13 ++++++------
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/erpnext/crm/doctype/newsletter_list/newsletter_list.py b/erpnext/crm/doctype/newsletter_list/newsletter_list.py
index 010678ad0d..a1e0cc83a4 100644
--- a/erpnext/crm/doctype/newsletter_list/newsletter_list.py
+++ b/erpnext/crm/doctype/newsletter_list/newsletter_list.py
@@ -47,6 +47,10 @@ class NewsletterList(Document):
 		self.db_update()
 		return self.total_subscribers
 
+	def on_trash(self):
+		for d in frappe.get_all("Newsletter List Subscriber", {"newsletter_list": self.name}):
+			frappe.delete_doc(d.doctype, d.name)
+
 @frappe.whitelist()
 def import_from(name, doctype):
 	nlist = frappe.get_doc("Newsletter List", name)
diff --git a/erpnext/crm/doctype/newsletter_list/test_newsletter_list.py b/erpnext/crm/doctype/newsletter_list/test_newsletter_list.py
index 686c571b5a..d5d0d19c14 100644
--- a/erpnext/crm/doctype/newsletter_list/test_newsletter_list.py
+++ b/erpnext/crm/doctype/newsletter_list/test_newsletter_list.py
@@ -9,4 +9,23 @@ import unittest
 # test_records = frappe.get_test_records('Newletter List')
 
 class TestNewletterList(unittest.TestCase):
-	pass
+	def test_import(self):
+		frappe.delete_doc("Newsletter List", "_Test Newsletter List 1")
+
+		new_list = frappe.get_doc({
+			"doctype": "Newsletter List",
+			"title": "_Test Newsletter List 1"
+		}).insert()
+
+		n_leads = frappe.db.count("Lead")
+
+		added = new_list.import_from("Lead")
+
+		print added
+
+		self.assertEquals(added, n_leads)
+
+		frappe.delete_doc("Newsletter List", new_list.name)
+
+test_dependencies = ["Lead"]
+
diff --git a/erpnext/patches/v5_0/convert_stock_reconciliation.py b/erpnext/patches/v5_0/convert_stock_reconciliation.py
index c4141f17fd..2f262aae73 100644
--- a/erpnext/patches/v5_0/convert_stock_reconciliation.py
+++ b/erpnext/patches/v5_0/convert_stock_reconciliation.py
@@ -12,13 +12,12 @@ def execute():
 			sr = frappe.get_doc("Stock Reconciliation", sr.name)
 			for item in json.loads(sr.reconciliation_json):
 				if start:
-					if item.get("item_code"):
-						sr.append("items", {
-							"item_code": item[0],
-							"warehouse": item[1],
-							"valuation_rate": item[3],
-							"qty": item[4]
-						})
+					sr.append("items", {
+						"item_code": item[0],
+						"warehouse": item[1],
+						"valuation_rate": item[3],
+						"qty": item[4]
+					})
 
 				elif item[0]=="Item Code":
 					start = True