[test-fix]
diff --git a/erpnext/crm/doctype/newsletter_list/newsletter_list.py b/erpnext/crm/doctype/newsletter_list/newsletter_list.py
index 010678a..a1e0cc8 100644
--- a/erpnext/crm/doctype/newsletter_list/newsletter_list.py
+++ b/erpnext/crm/doctype/newsletter_list/newsletter_list.py
@@ -47,6 +47,10 @@
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 686c571..d5d0d19 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 @@
# 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 c4141f1..2f262aa 100644
--- a/erpnext/patches/v5_0/convert_stock_reconciliation.py
+++ b/erpnext/patches/v5_0/convert_stock_reconciliation.py
@@ -12,13 +12,12 @@
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