[messages] cleanup
diff --git a/erpnext/setup/setup_wizard/sample_data.py b/erpnext/setup/setup_wizard/sample_data.py
index 40b4f2e..cfc6726 100644
--- a/erpnext/setup/setup_wizard/sample_data.py
+++ b/erpnext/setup/setup_wizard/sample_data.py
@@ -105,46 +105,34 @@
if domain == 'Education':
tasks += [
{
- "title": _("Setup Master Data"),
+ "title": _("Setup your School in ERPNext"),
"start_date": current_date,
"end_date": frappe.utils.add_days(current_date, 1),
"file": "school_masters.md"
},
{
- "title": _("Manage Operations"),
+ "title": "Setup Master Data",
"start_date": current_date,
- "end_date": frappe.utils.add_days(current_date, 2),
- "file": "school_operations.md"
- },
- {
- "title": _("Import Data"),
- "start_date": current_date,
- "end_date": frappe.utils.add_days(current_date, 3),
- "file": "school_import_data.md"
- },
- {
- "title": "Go Live!",
- "start_date": current_date,
- "end_date": frappe.utils.add_days(current_date, 4),
- "file": "school_go_live.md"
+ "end_date": frappe.utils.add_days(current_date, 1),
+ "file": "school_masters.md"
}]
else:
tasks += [
{
- "title": "Setup Master Data",
+ "title": "Setup Your Company",
"start_date": current_date,
"end_date": frappe.utils.add_days(current_date, 1),
"file": "masters.md"
},
{
- "title": "Try a Sales Cycle",
+ "title": "Start Tracking your Sales",
"start_date": current_date,
"end_date": frappe.utils.add_days(current_date, 2),
"file": "sales.md"
},
{
- "title": "Try a Purchase Cycle",
+ "title": "Start Managing Purchases",
"start_date": current_date,
"end_date": frappe.utils.add_days(current_date, 3),
"file": "purchase.md"
@@ -177,6 +165,10 @@
email_alert = frappe.get_doc(json.loads(f.read())[0])
email_alert.insert()
+ # trigger the first message!
+ from frappe.email.doctype.email_alert.email_alert import trigger_daily_alerts
+ trigger_daily_alerts()
+
def test_sample():
frappe.db.sql('delete from `tabEmail Alert`')
frappe.db.sql('delete from tabProject')
diff --git a/erpnext/setup/setup_wizard/tasks/explore.md b/erpnext/setup/setup_wizard/tasks/explore.md
index eebde47..ce6cb60 100644
--- a/erpnext/setup/setup_wizard/tasks/explore.md
+++ b/erpnext/setup/setup_wizard/tasks/explore.md
@@ -2,13 +2,6 @@
If you are evaluating an ERP system for the first time, this is going to be quite a task! But don't worry, ERPNext is awesome.
-First, let's just get familiar with the surroundings. ERPNext covers a *lot of features*, go to the home page and click on the "Explore" icon. Click on all the modules, and make a list of things you want to do.
+First, get familiar with the surroundings. ERPNext covers a *lot of features*, go to the home page and click on the "Explore" icon.
-Whats more, you can also update it here:
-
-Things I like to do in ERPNext
-
-👇👇👇👇
-
-1.
-2.
\ No newline at end of file
+All the best!
\ No newline at end of file
diff --git a/erpnext/setup/setup_wizard/tasks/go_live.md b/erpnext/setup/setup_wizard/tasks/go_live.md
index 4e5c1d4..0a934a4 100644
--- a/erpnext/setup/setup_wizard/tasks/go_live.md
+++ b/erpnext/setup/setup_wizard/tasks/go_live.md
@@ -1,21 +1,18 @@
-Ready to go live with ERPNext?
+Ready to go live with ERPNext? 🏁🏁🏁
-So lets be clear,
-
-1. You tried a few cycles in ERPNext
-2. You have imported all your records - your model of your organization is complete.
-3. You can see the Matrix 🙅
-
-Now lets bring the current "state" of your business into ERPNext. For this you need to do a few more things.
-
-Warning: This might be tricky, and you can always do this later and you might need the help of your accountant to help you with this.
+Here are the steps:
1. Sync up your **Chart of Accounts**
3. Add your opening stock using **Stock Reconciliation**
4. Add your open invoices (both sales and purchase)
3. Add your opening account balances by making a **Journal Entry**
-You are now set to go! 🏁 😎
-
If you need help for going live, sign up for an account at erpnext.com or find a partner to help you with this.
+Or you can watch these videos 📺:
+
+Setup your chart of accounts: https://www.youtube.com/watch?v=AcfMCT7wLLo
+
+Add Open Stock: https://www.youtube.com/watch?v=nlHX0ZZ84Lw
+
+Add Opening Balances: https://www.youtube.com/watch?v=nlHX0ZZ84Lw
diff --git a/erpnext/setup/setup_wizard/tasks/import_data.md b/erpnext/setup/setup_wizard/tasks/import_data.md
index b5ad91e..c5b85c9 100644
--- a/erpnext/setup/setup_wizard/tasks/import_data.md
+++ b/erpnext/setup/setup_wizard/tasks/import_data.md
@@ -1,8 +1,5 @@
-Ready for some real stuff? 💪 Lets import some data!
+Lets import some data! 💪💪
-If you are already running a business, you most likely have your Items, Customers or Suppliers in some spreadsheet file somewhere.
+If you are already running a business, you most likely have your Items, Customers or Suppliers in some spreadsheet file somewhere, import it into ERPNext with the Data Import Tool.
-You can quickly get them into ERPNext by using the data import tool. Just type "data import" in the search bar to get started 🔎
-
-If you need help, just head to the user forum https://discuss.erpnext.com
-
+Watch this video to get started: https://www.youtube.com/watch?v=Ta2Xx3QoK3E
diff --git a/erpnext/setup/setup_wizard/tasks/masters.md b/erpnext/setup/setup_wizard/tasks/masters.md
index 2e286de..6ade159 100644
--- a/erpnext/setup/setup_wizard/tasks/masters.md
+++ b/erpnext/setup/setup_wizard/tasks/masters.md
@@ -1,14 +1,7 @@
-💡Tip: Your ERPNext account is a model of your real business 🏠
+Start building a model of your business in ERPNext by adding your Items and Customers.
-So what does a business exactly do?
+These videos 📺 will help you get started:
-**You sell products (or services) to a customer**
+Adding Customers and Suppliers: https://www.youtube.com/watch?v=zsrrVDk6VBs
-To start building a model of your business, you can start with just 2 things:
-
-1. Customers
-2. Items
-
-Start adding them now!
-
-Hint: type "Item" in the search bar above 🔎
\ No newline at end of file
+Adding Items and Prices: https://www.youtube.com/watch?v=FcOsV-e8ymE
\ No newline at end of file
diff --git a/erpnext/setup/setup_wizard/tasks/purchase.md b/erpnext/setup/setup_wizard/tasks/purchase.md
index 491248d..3f3bc3b 100644
--- a/erpnext/setup/setup_wizard/tasks/purchase.md
+++ b/erpnext/setup/setup_wizard/tasks/purchase.md
@@ -1,13 +1,10 @@
-Already figured out sales? Nice, now lets get to purchasing stuff.
+How to manage your purchasing in ERPNext 🛒🛒🛒:
-1. First add a few **Suppliers**
-2. Find out what you need by making **Material Requests**. Think of them as stickies 🗒 on your refrigerator.
+1. Add a few **Suppliers**
+2. Find out what you need by making **Material Requests**.
3. Now start placing orders via **Purchase Order**.
4. When your suppliers deliver, make **Purchase Receipts**
-Thats it!
-
-If you track inventory on your items, they will automatically be added to your stock.
-
Now never run out of stock again! 😎
+Watch this video 📺 to get an overview: https://www.youtube.com/watch?v=4TN9kPyfIqM
\ No newline at end of file
diff --git a/erpnext/setup/setup_wizard/tasks/sales.md b/erpnext/setup/setup_wizard/tasks/sales.md
index 960a988..15268fa 100644
--- a/erpnext/setup/setup_wizard/tasks/sales.md
+++ b/erpnext/setup/setup_wizard/tasks/sales.md
@@ -1,17 +1,8 @@
-ERPNext covers most of what you need to start selling. 🔔
+Start managing your sales with ERPNext 🔔🔔🔔:
-Few terms to get familiar with:
+1. Add potential business contacts as **Leads**
+2. Udpate your deals in pipeline in **Opportunities**
+3. Send proposals to your leads or customers with **Quotations**
+4. Track confirmed orders with **Sales Orders**
-1. Potential customers are **Leads**
-2. Deals in pipeline are **Opportunities**
-3. Proposals sent to customers are **Quotations**
-4. Confirmed orders are **Sales Orders**
-5. Fulfilment (shipment or completion of services) is **Delivery Note**
-
-The first thing you should probably do is add 5 leads (contact information about prospects who can give you new business). Hint: just type "Lead" in the search bar on the top 🔎
-
-Find out if they have any need you can help with and make a few "Opportunities"
-
-Then send them proposals with "Quotation". Did you know, you can email them directly from ERPNext! 😎
-
-See your sales go up up up! 📈
\ No newline at end of file
+Watch this video 📺 to get an overview: https://www.youtube.com/watch?v=o9XCSZHJfpA
diff --git a/erpnext/setup/setup_wizard/tasks/school_go_live.md b/erpnext/setup/setup_wizard/tasks/school_go_live.md
deleted file mode 100644
index e470507..0000000
--- a/erpnext/setup/setup_wizard/tasks/school_go_live.md
+++ /dev/null
@@ -1,20 +0,0 @@
-Ready to go live with ERPNext?
-
-So lets be clear,
-
-1. You tried a doing a few things in ERPNext
-2. You have imported all your records - your model of your school is complete.
-3. You can see the Matrix 🙅
-
-Now lets bring the current "state" of your institute into ERPNext -> This includes the standard organization stuff like accounts and inventory management. For this you need to do a few more things.
-
-Warning: This might be tricky, and you can always do this later and you might need the help of your accountant to help you with this.
-
-1. Sync up your **Chart of Accounts**
-3. Add your opening stock using **Stock Reconciliation**
-3. Add your opening account balances by making a **Journal Entry**
-
-You are now set to go! 🏁 😎
-
-If you need help for going live, sign up for an account at erpnext.com or find a partner to help you with this.
-
diff --git a/erpnext/setup/setup_wizard/tasks/school_import_data.md b/erpnext/setup/setup_wizard/tasks/school_import_data.md
index 9074e9a..c465b81 100644
--- a/erpnext/setup/setup_wizard/tasks/school_import_data.md
+++ b/erpnext/setup/setup_wizard/tasks/school_import_data.md
@@ -1,8 +1,5 @@
-Ready for some real stuff? 💪 Lets import some data!
+Lets import some data! 💪💪
-If you are already running a school, you most likely have your Students in some spreadsheet file somewhere.
+If you are already running a school, you most likely have your Students in some spreadsheet file somewhere. Import it into ERPNext with the Data Import Tool.
-You can quickly get them into ERPNext by using the data import tool. Just type "data import" in the search bar to get started 🔎
-
-If you need help, just head to the user forum https://discuss.erpnext.com
-
+Watch this video to get started: https://www.youtube.com/watch?v=Ta2Xx3QoK3E
\ No newline at end of file
diff --git a/erpnext/setup/setup_wizard/tasks/school_masters.md b/erpnext/setup/setup_wizard/tasks/school_masters.md
index 2e072d1..9103935 100644
--- a/erpnext/setup/setup_wizard/tasks/school_masters.md
+++ b/erpnext/setup/setup_wizard/tasks/school_masters.md
@@ -1,6 +1,4 @@
-💡Tip: Your ERPNext account is a model of your school or college 🏠
-
-Lets start making things in ERPNext that are reprentative of your institution.
+Lets start making things in ERPNext that are representative of your institution.
1. Make a list of **Programs** that you offer
1. Add a few **Courses** that your programs cover
@@ -8,4 +6,4 @@
1. Start adding **Students**
1. Group your students into **Batches**
-Now you are ready to run your school. Start by tracking attendance! 🖐
+Watch this video to learn more about ERPNext Schools: https://www.youtube.com/watch?v=f6foQOyGzdA
diff --git a/erpnext/setup/setup_wizard/tasks/school_operations.md b/erpnext/setup/setup_wizard/tasks/school_operations.md
deleted file mode 100644
index 6b49cd2..0000000
--- a/erpnext/setup/setup_wizard/tasks/school_operations.md
+++ /dev/null
@@ -1,11 +0,0 @@
-ERPNext will help you manage your day-to-day operations 📝
-
-1. Admissions
-1. Attendance
-1. Assessments
-1. Fee collection
-1. Time Table and scheduling
-
-Unless you have a dedicated team to set this up for you, we recommend using student attendance first! For that you need to create Student Batches and Student Groups. What is the difference?
-
-If all your students in a group have the same set of classes (like in a primary school) then you make batches. If your student in a particular program can select their courses, you need to create a Student Group for each course! 👩👩👧👧👨👨👧👦
\ No newline at end of file
diff --git a/erpnext/setup/setup_wizard/tasks/task_alert.json b/erpnext/setup/setup_wizard/tasks/task_alert.json
index 9c8462a..dca6845 100644
--- a/erpnext/setup/setup_wizard/tasks/task_alert.json
+++ b/erpnext/setup/setup_wizard/tasks/task_alert.json
@@ -1,28 +1,28 @@
[
{
- "attach_print": 0,
- "condition": "doc.status in ('Open', 'Overdue')",
- "date_changed": "exp_end_date",
- "days_in_advance": 0,
- "docstatus": 0,
- "doctype": "Email Alert",
- "document_type": "Task",
- "enabled": 1,
- "event": "Days After",
- "is_standard": 0,
- "message": "<p>Task due today:</p>\n\n<div>\n{{ doc.description }}\n</div>\n\n<hr>\n<p style=\"font-size: 85%\">\nThis is a notification for a task that is due today, and a sample <b>Email Alert</b>. In ERPNext you can setup email alerts on anything, Invoices, Orders, Leads, Opportunities, so you never miss a thing.\n</p>",
- "method": null,
- "modified": "2017-03-09 07:34:58.168370",
- "module": null,
- "name": "Task Due Alert",
+ "attach_print": 0,
+ "condition": "doc.status in ('Open', 'Overdue')",
+ "date_changed": "exp_end_date",
+ "days_in_advance": 0,
+ "docstatus": 0,
+ "doctype": "Email Alert",
+ "document_type": "Task",
+ "enabled": 1,
+ "event": "Days After",
+ "is_standard": 0,
+ "message": "<p>Task due today:</p>\n\n<div>\n{{ doc.description }}\n</div>\n\n<hr>\n<p style=\"font-size: 85%\">\nThis is a notification for a task that is due today, and a sample <b>Email Alert</b>. In ERPNext you can setup email alerts on anything, Invoices, Orders, Leads, Opportunities, so you never miss a thing.\n<br>To edit this, and setup other alerts, just type <b>Email Alert</b> in the search bar.</p>",
+ "method": null,
+ "modified": "2017-03-09 07:34:58.168370",
+ "module": null,
+ "name": "Task Due Alert",
"recipients": [
{
- "cc": null,
- "condition": null,
+ "cc": null,
+ "condition": null,
"email_by_document_field": "owner"
}
- ],
- "subject": "{{ doc.subject }}",
+ ],
+ "subject": "{{ doc.subject }}",
"value_changed": null
}
]
\ No newline at end of file