[minor] fixes in welcome mails
diff --git a/erpnext/crm/doctype/newsletter_list/newsletter_list.py b/erpnext/crm/doctype/newsletter_list/newsletter_list.py
index 3116bbe..4f89c9a 100644
--- a/erpnext/crm/doctype/newsletter_list/newsletter_list.py
+++ b/erpnext/crm/doctype/newsletter_list/newsletter_list.py
@@ -60,8 +60,10 @@
@frappe.whitelist()
def add_subscribers(name, email_list):
+ if not isinstance(email_list, (list, tuple)):
+ email_list = email_list.replace(",", "\n").split("\n")
count = 0
- for email in email_list.replace(",", "\n").split("\n"):
+ for email in email_list:
email = email.strip()
validate_email_add(email, True)
diff --git a/erpnext/setup/page/setup_wizard/emails/email-1.md b/erpnext/setup/page/setup_wizard/emails/email-1.md
index 56ad94f..9ade6c1 100644
--- a/erpnext/setup/page/setup_wizard/emails/email-1.md
+++ b/erpnext/setup/page/setup_wizard/emails/email-1.md
@@ -1,15 +1,14 @@
Dear {{ fullname }},
-If you aren't a pro, setting me up, is not an easy job. Here are some tips:
+Some tips on setting up ERPNext:
-1. Try and make dummy cycles: Run your dummy quotes, invoices, payments, deliveries in the system so that you can get familiar with what I can do for you.
-1. Data Import Tool: You can import bulk data into me using the data import tool: via Setup > Data > Data Import Tool
-1. Help me make more friends: Add more users via Setup > Users and Permissions > User
+1. Try and make dummy cycles: Run your dummy quotes, invoices, payments, deliveries in the system so that you can get familiar with what ERPNext can do for you.
+1. Data Import Tool: You can import bulk data into system using the data import tool: via **Setup > Data > Data Import Tool**.
+1. Add more users via **Setup > Users and Permissions > User**.
+1. If you are done with the testing and want to start fresh, you can delete your company and create a new one.
-If you need help or are stuck, [head to the user forum](https://discuss.frappe.io) or [read my manual](https://manual.erpnext.com).
+If you need help or are stuck, [head to the user forum](https://discuss.frappe.io) or [read the manual](https://manual.erpnext.com).
Best of luck!
-Your ERPNext Account\*
-
-\* This is an automated messaged sent by your ERPNext installation to keep you motivated. You will receive one more such message in another 3 days.
+Automatically Sent from your ERPNext Account
diff --git a/erpnext/setup/page/setup_wizard/emails/email-2.md b/erpnext/setup/page/setup_wizard/emails/email-2.md
index f2b5d6a..a431d47 100644
--- a/erpnext/setup/page/setup_wizard/emails/email-2.md
+++ b/erpnext/setup/page/setup_wizard/emails/email-2.md
@@ -1,8 +1,6 @@
Dear {{ fullname }},
-Hey, how's it going?
-
-If you still need some help, there is a large community out there to help you. Some places you can start:
+If you need help in setting up your ERPNext account, here are some resources:
1. [Ask your questions in the user forum](https://discuss.frappe.io)
1. [Buy support from the ERPNext Team](https://erpnext.com/pricing)
@@ -11,6 +9,4 @@
Thanks!
-Your ERPNext Account\*
-
-\* That's it from me. Have fun!
+Automatically sent from your ERPNext Account