Merge pull request #16633 from pratu16x7/explore-2.0
feat(modules): Add getting started and help desk, merge settings
diff --git a/erpnext/config/accounting.py b/erpnext/config/accounting.py
index a8b9447..9de5b36 100644
--- a/erpnext/config/accounting.py
+++ b/erpnext/config/accounting.py
@@ -108,7 +108,7 @@
},
{
- "label": _("Setup"),
+ "label": _("Settings"),
"icon": "fa fa-cog",
"items": [
{
@@ -174,7 +174,6 @@
"name": "General Ledger",
"doctype": "GL Entry",
"is_query_report": True,
- "onboard": 1,
},
{
"type": "report",
diff --git a/erpnext/config/buying.py b/erpnext/config/buying.py
index c52b9a2..9d1eda5 100644
--- a/erpnext/config/buying.py
+++ b/erpnext/config/buying.py
@@ -78,7 +78,7 @@
]
},
{
- "label": _("Setup"),
+ "label": _("Settings"),
"icon": "fa fa-cog",
"items": [
{
diff --git a/erpnext/config/crm.py b/erpnext/config/crm.py
index 3119824..e49fc60 100644
--- a/erpnext/config/crm.py
+++ b/erpnext/config/crm.py
@@ -106,7 +106,7 @@
]
},
{
- "label": _("Setup"),
+ "label": _("Settings"),
"icon": "fa fa-cog",
"items": [
{
@@ -159,52 +159,6 @@
]
},
{
- "label": _("Support"),
- "items": [
- {
- "type": "doctype",
- "name": "Issue",
- "description": _("Support queries from customers."),
- "onboard": 1,
- },
- {
- "type": "doctype",
- "name": "Communication",
- "description": _("Communication log."),
- },
- {
- "type": "doctype",
- "name": "Warranty Claim",
- "description": _("Warranty Claim against Serial No."),
- },
- {
- "type": "doctype",
- "name": "Serial No",
- "description": _("Single unit of an Item."),
- },
- {
- "type": "page",
- "name": "support-analytics",
- "label": _("Support Analytics"),
- "icon": "fa fa-bar-chart"
- },
- {
- "type": "report",
- "name": "Minutes to First Response for Issues",
- "doctype": "Issue",
- "is_query_report": True,
- "dependencies": ["Issue"],
- },
- {
- "type": "report",
- "name": "Support Hours",
- "doctype": "Issue",
- "is_query_report": True,
- "dependencies": ["Issue"]
- },
- ]
- },
- {
"label": _("Maintenance"),
"icon": "fa fa-star",
"items": [
diff --git a/erpnext/config/desktop.py b/erpnext/config/desktop.py
index fd5906a..5d4dfa1 100644
--- a/erpnext/config/desktop.py
+++ b/erpnext/config/desktop.py
@@ -7,6 +7,16 @@
return [
# Modules
{
+ "module_name": "Getting Started",
+ "category": "Modules",
+ "label": _("Getting Started"),
+ "color": "#1abc9c",
+ "icon": "fa fa-check-square-o",
+ "type": "module",
+ "hidden": 1,
+ "description": "Dive into the basics for your organisation's needs."
+ },
+ {
"module_name": "Accounting",
"category": "Modules",
"label": _("Accounting"),
@@ -14,7 +24,7 @@
"icon": "octicon octicon-repo",
"type": "module",
"hidden": 1,
- "description": "Accounts, Billing, Payments, Cost Center and Budgeting."
+ "description": "Accounts, billing, payments, cost center and budgeting."
},
{
"module_name": "Selling",
@@ -24,7 +34,7 @@
"icon": "octicon octicon-tag",
"type": "module",
"hidden": 1,
- "description": "All things Sales, Customer and Products."
+ "description": "Sales orders, quotations, customers and items."
},
{
"module_name": "Buying",
@@ -34,7 +44,7 @@
"icon": "octicon octicon-briefcase",
"type": "module",
"hidden": 1,
- "description": "Purchasing, Suppliers and Products."
+ "description": "Purchasing, suppliers, material requests, and items."
},
{
"module_name": "Stock",
@@ -44,7 +54,7 @@
"icon": "octicon octicon-package",
"type": "module",
"hidden": 1,
- "description": "Track Stock Transactions, Reports, and Serialized Items and Batches."
+ "description": "Stock transactions, reports, serial numbers and batches."
},
{
"module_name": "Assets",
@@ -54,7 +64,7 @@
"icon": "octicon octicon-database",
"hidden": 1,
"type": "module",
- "description": "Asset Maintainance and Tools."
+ "description": "Asset movement, maintainance and tools."
},
{
"module_name": "Projects",
@@ -74,7 +84,17 @@
"icon": "octicon octicon-broadcast",
"type": "module",
"hidden": 1,
- "description": "Everything in your sales pipeline, from Leads to Customers, to Support."
+ "description": "Sales pipeline, leads, opportunities and customers."
+ },
+ {
+ "module_name": "Help Desk",
+ "category": "Modules",
+ "label": _("Help Desk"),
+ "color": "#1abc9c",
+ "icon": "fa fa-check-square-o",
+ "type": "module",
+ "hidden": 1,
+ "description": "User interactions, support issues and knowledge base."
},
{
"module_name": "HR",
@@ -84,7 +104,7 @@
"icon": "octicon octicon-organization",
"type": "module",
"hidden": 1,
- "description": "Employee Lifecycle, Payroll, Shifts and Leaves."
+ "description": "Employees, attendance, payroll, leaves and shifts."
},
{
"module_name": "Quality Management",
@@ -94,7 +114,7 @@
"icon": "fa fa-check-square-o",
"type": "module",
"hidden": 1,
- "description": "Volunteers, Memberships, Grants and Chapters."
+ "description": "Quality goals, procedures, reviews and action."
},
@@ -107,7 +127,7 @@
"icon": "octicon octicon-tools",
"type": "module",
"hidden": 1,
- "description": "Streamline your production with BOMS, Work Orders and Timesheets."
+ "description": "BOMS, work orders, operations, and timesheets."
},
{
"module_name": "Retail",
@@ -117,7 +137,7 @@
"icon": "octicon octicon-credit-card",
"type": "module",
"hidden": 1,
- "description": "Point of Sale, Cashier Closing and Loyalty Programs."
+ "description": "Point of Sale and cashier closing."
},
{
"module_name": "Education",
@@ -127,7 +147,7 @@
"icon": "octicon octicon-mortar-board",
"type": "module",
"hidden": 1,
- "description": "Manage Student Admissions, Fees, Subjects and Score Reports."
+ "description": "Student admissions, fees, courses and scores."
},
{
@@ -138,7 +158,7 @@
"icon": "fa fa-heartbeat",
"type": "module",
"hidden": 1,
- "description": "Patients appointments, procedures and tests, with diagnosis reports and drug prescriptions."
+ "description": "Patient appointments, procedures and tests."
},
{
"module_name": "Agriculture",
@@ -148,7 +168,7 @@
"icon": "octicon octicon-globe",
"type": "module",
"hidden": 1,
- "description": "Crop Cycles, Land Areas and Soil and Plant Analysis."
+ "description": "Crop cycles, land areas, soil and plant analysis."
},
{
"module_name": "Hotels",
@@ -158,7 +178,7 @@
"icon": "fa fa-bed",
"type": "module",
"hidden": 1,
- "description": "Manage Hotel Rooms, Pricing, Reservation and Amenities."
+ "description": "Hotel rooms, pricing, reservation and amenities."
},
{
@@ -169,7 +189,7 @@
"icon": "octicon octicon-heart",
"type": "module",
"hidden": 1,
- "description": "Make benefiting others easier with Volunteers, Memberships, Grants and Chapters."
+ "description": "Volunteers, memberships, grants and chapters."
},
{
"module_name": "Restaurant",
@@ -203,17 +223,6 @@
"link": '#marketplace/home',
"color": '#FF4136',
'standard': 1,
- "description": "Publish items to other ERPNext users and start a conversation."
- },
- {
- "module_name": "Settings",
- "category": "Administration",
- "label": _("Settings"),
- "color": "#bdc3c7",
- "reverse": 1,
- "icon": "octicon octicon-settings",
- "type": "module",
- "hidden": 1,
- "description": "Global settings for all modules in ERPNext, with Email Digest and SMS."
+ "description": "Publish items to other ERPNext users."
},
]
diff --git a/erpnext/config/education.py b/erpnext/config/education.py
index 5a05a25..96e7e81 100644
--- a/erpnext/config/education.py
+++ b/erpnext/config/education.py
@@ -198,7 +198,7 @@
]
},
{
- "label": _("Setup"),
+ "label": _("Settings"),
"items": [
{
"type": "doctype",
diff --git a/erpnext/config/getting_started.py b/erpnext/config/getting_started.py
new file mode 100644
index 0000000..19b71d2
--- /dev/null
+++ b/erpnext/config/getting_started.py
@@ -0,0 +1,261 @@
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+
+active_domains = frappe.get_active_domains()
+
+def get_data():
+ return [
+ {
+ "label": _("Accounting"),
+ "items": [
+ {
+ "type": "doctype",
+ "name": "Item",
+ "onboard": 1,
+ },
+ {
+ "type": "doctype",
+ "name": "Customer",
+ "description": _("Customer database."),
+ "onboard": 1,
+ },
+ {
+ "type": "doctype",
+ "name": "Supplier",
+ "description": _("Supplier database."),
+ "onboard": 1,
+ },
+ {
+ "type": "doctype",
+ "name": "Company",
+ "description": _("Company (not Customer or Supplier) master."),
+ "onboard": 1,
+ },
+ {
+ "type": "doctype",
+ "name": "Account",
+ "icon": "fa fa-sitemap",
+ "label": _("Chart of Accounts"),
+ "route": "#Tree/Account",
+ "description": _("Tree of financial accounts."),
+ "onboard": 1,
+ },
+ {
+ "type": "doctype",
+ "name": "Opening Invoice Creation Tool",
+ "description": _("Create Opening Sales and Purchase Invoices"),
+ "onboard": 1,
+ },
+ ]
+ },
+ {
+ "label": _("Data Import and Settings"),
+ "items": [
+ {
+ "type": "doctype",
+ "name": "Data Import",
+ "label": _("Import Data"),
+ "icon": "octicon octicon-cloud-upload",
+ "description": _("Import Data from CSV / Excel files."),
+ "onboard": 1,
+ },
+ {
+ "type": "doctype",
+ "name": "Letter Head",
+ "description": _("Letter Heads for print templates."),
+ "onboard": 1,
+ },
+ {
+ "type": "doctype",
+ "name": "Email Account",
+ "description": _("Add / Manage Email Accounts."),
+ "onboard": 1,
+ },
+
+ ]
+ },
+ {
+ "label": _("Stock"),
+ "items": [
+ {
+ "type": "doctype",
+ "name": "Warehouse",
+ "onboard": 1,
+ },
+ {
+ "type": "doctype",
+ "name": "Brand",
+ "onboard": 1,
+ },
+ {
+ "type": "doctype",
+ "name": "UOM",
+ "label": _("Unit of Measure") + " (UOM)",
+ "onboard": 1,
+ },
+ {
+ "type": "doctype",
+ "name": "Stock Reconciliation",
+ "onboard": 1,
+ },
+ ]
+ },
+ {
+ "label": _("CRM"),
+ "items": [
+ {
+ "type": "doctype",
+ "name": "Lead",
+ "description": _("Database of potential customers."),
+ "onboard": 1,
+ },
+ {
+ "type": "doctype",
+ "label": _("Customer Group"),
+ "name": "Customer Group",
+ "icon": "fa fa-sitemap",
+ "link": "Tree/Customer Group",
+ "description": _("Manage Customer Group Tree."),
+ "onboard": 1,
+ },
+ {
+ "type": "doctype",
+ "label": _("Territory"),
+ "name": "Territory",
+ "icon": "fa fa-sitemap",
+ "link": "Tree/Territory",
+ "description": _("Manage Territory Tree."),
+ "onboard": 1,
+ },
+ ]
+ },
+ {
+ "label": _("Human Resources"),
+ "items": [
+ {
+ "type": "doctype",
+ "name": "Employee",
+ "onboard": 1,
+ },
+ {
+ "type": "doctype",
+ "name": "Employee Attendance Tool",
+ "hide_count": True,
+ "onboard": 1,
+ "dependencies": ["Employee"]
+ },
+ {
+ "type": "doctype",
+ "name": "Salary Structure",
+ "onboard": 1,
+ },
+ ]
+ },
+ {
+ "label": _("Education"),
+ "condition": "Education" in active_domains,
+ "items": [
+ {
+ "type": "doctype",
+ "name": "Student",
+ "onboard": 1,
+ },
+ {
+ "type": "doctype",
+ "name": "Course",
+ "onboard": 1,
+ },
+ {
+ "type": "doctype",
+ "name": "Instructor",
+ "onboard": 1,
+ },
+ {
+ "type": "doctype",
+ "name": "Room",
+ "onboard": 1,
+ },
+ ]
+ },
+ {
+ "label": _("Healthcare"),
+ "condition": "Healthcare" in active_domains,
+ "items": [
+ {
+ "type": "doctype",
+ "name": "Patient",
+ "label": _("Patient"),
+ "onboard": 1,
+ },
+ {
+ "type": "doctype",
+ "name": "Physician",
+ "label": _("Physician"),
+ "onboard": 1,
+ },
+ {
+ "type": "doctype",
+ "name": "Diagnosis",
+ "label": _("Diagnosis"),
+ "onboard": 1,
+ }
+ ]
+ },
+ {
+ "label": _("Agriculture"),
+ "condition": "Agriculture" in active_domains,
+ "items": [
+ {
+ "type": "doctype",
+ "name": "Crop",
+ "onboard": 1,
+ },
+ {
+ "type": "doctype",
+ "name": "Crop Cycle",
+ "onboard": 1,
+ },
+ {
+ "type": "doctype",
+ "name": "Location",
+ "onboard": 1,
+ },
+ {
+ "type": "doctype",
+ "name": "Fertilizer",
+ "onboard": 1,
+ }
+ ]
+ },
+ {
+ "label": _("Non Profit"),
+ "condition": "Non Profit" in active_domains,
+ "items": [
+ {
+ "type": "doctype",
+ "name": "Member",
+ "description": _("Member information."),
+ "onboard": 1,
+ },
+ {
+ "type": "doctype",
+ "name": "Volunteer",
+ "description": _("Volunteer information."),
+ "onboard": 1,
+ },
+ {
+ "type": "doctype",
+ "name": "Chapter",
+ "description": _("Chapter information."),
+ "onboard": 1,
+ },
+ {
+ "type": "doctype",
+ "name": "Donor",
+ "description": _("Donor information."),
+ "onboard": 1,
+ },
+ ]
+ }
+ ]
\ No newline at end of file
diff --git a/erpnext/config/healthcare.py b/erpnext/config/healthcare.py
index e55f736..de0167b 100644
--- a/erpnext/config/healthcare.py
+++ b/erpnext/config/healthcare.py
@@ -105,7 +105,7 @@
]
},
{
- "label": _("Setup"),
+ "label": _("Settings"),
"icon": "icon-cog",
"items": [
{
diff --git a/erpnext/config/help.py b/erpnext/config/help.py
index 1353892..922afb4 100644
--- a/erpnext/config/help.py
+++ b/erpnext/config/help.py
@@ -30,7 +30,7 @@
},
{
- "label": _("Setup"),
+ "label": _("Settings"),
"items": [
{
"type": "help",
diff --git a/erpnext/config/help_desk.py b/erpnext/config/help_desk.py
new file mode 100644
index 0000000..adc84f2
--- /dev/null
+++ b/erpnext/config/help_desk.py
@@ -0,0 +1,62 @@
+from __future__ import unicode_literals
+from frappe import _
+
+def get_data():
+ return [
+ {
+ "label": _("Issues"),
+ "items": [
+ {
+ "type": "doctype",
+ "name": "Issue",
+ "description": _("Support queries from customers."),
+ "onboard": 1,
+ },
+ {
+ "type": "doctype",
+ "name": "Communication",
+ "description": _("Communication log."),
+ "onboard": 1,
+ },
+ ]
+ },
+ {
+ "label": _("Warranty"),
+ "items": [
+ {
+ "type": "doctype",
+ "name": "Warranty Claim",
+ "description": _("Warranty Claim against Serial No."),
+ },
+ {
+ "type": "doctype",
+ "name": "Serial No",
+ "description": _("Single unit of an Item."),
+ },
+ ]
+ },
+ {
+ "label": _("Reports"),
+ "icon": "fa fa-list",
+ "items": [
+ {
+ "type": "page",
+ "name": "support-analytics",
+ "label": _("Support Analytics"),
+ "icon": "fa fa-bar-chart"
+ },
+ {
+ "type": "report",
+ "name": "Minutes to First Response for Issues",
+ "doctype": "Issue",
+ "is_query_report": True
+ },
+ {
+ "type": "report",
+ "name": "Support Hours",
+ "doctype": "Issue",
+ "is_query_report": True
+ },
+ ]
+ },
+ ]
\ No newline at end of file
diff --git a/erpnext/config/hr.py b/erpnext/config/hr.py
index 93a9f41..f517a5e 100644
--- a/erpnext/config/hr.py
+++ b/erpnext/config/hr.py
@@ -106,7 +106,7 @@
]
},
{
- "label": _("Setup"),
+ "label": _("Settings"),
"icon": "fa fa-cog",
"items": [
{
diff --git a/erpnext/config/hub_node.py b/erpnext/config/hub_node.py
index 9b9fcc4..0afdeb5 100644
--- a/erpnext/config/hub_node.py
+++ b/erpnext/config/hub_node.py
@@ -4,7 +4,7 @@
def get_data():
return [
{
- "label": _("Setup"),
+ "label": _("Settings"),
"items": [
{
"type": "doctype",
diff --git a/erpnext/config/manufacturing.py b/erpnext/config/manufacturing.py
index e1b6980..da60550 100644
--- a/erpnext/config/manufacturing.py
+++ b/erpnext/config/manufacturing.py
@@ -97,7 +97,7 @@
]
},
{
- "label": _("Setup"),
+ "label": _("Settings"),
"items": [
{
"type": "doctype",
diff --git a/erpnext/config/selling.py b/erpnext/config/selling.py
index 9e190a7..1b9a7a0 100644
--- a/erpnext/config/selling.py
+++ b/erpnext/config/selling.py
@@ -112,7 +112,7 @@
]
},
{
- "label": _("Setup"),
+ "label": _("Settings"),
"icon": "fa fa-cog",
"items": [
{
diff --git a/erpnext/config/settings.py b/erpnext/config/settings.py
index 0bbf6ec..179586f1 100644
--- a/erpnext/config/settings.py
+++ b/erpnext/config/settings.py
@@ -11,7 +11,7 @@
{
"type": "doctype",
"name": "Global Defaults",
- "label": _("Global Settings"),
+ "label": _("ERPNext Settings"),
"description": _("Set Default Values like Company, Currency, Current Fiscal Year, etc."),
"hide_count": True,
"onboard": 1,
diff --git a/erpnext/config/stock.py b/erpnext/config/stock.py
index 6c06733..117b615 100644
--- a/erpnext/config/stock.py
+++ b/erpnext/config/stock.py
@@ -86,7 +86,7 @@
]
},
{
- "label": _("Setup"),
+ "label": _("Settings"),
"icon": "fa fa-cog",
"items": [
{
diff --git a/erpnext/setup/setup_wizard/operations/install_fixtures.py b/erpnext/setup/setup_wizard/operations/install_fixtures.py
index 6009bcc..d21de0e 100644
--- a/erpnext/setup/setup_wizard/operations/install_fixtures.py
+++ b/erpnext/setup/setup_wizard/operations/install_fixtures.py
@@ -252,7 +252,7 @@
from erpnext.buying.doctype.supplier_scorecard.supplier_scorecard import make_default_records
make_default_records()
- make_records(records, True)
+ make_records(records)
set_more_defaults()
@@ -366,7 +366,7 @@
}
]
- make_records(records, True)
+ make_records(records)
def install_post_company_fixtures(args=None):
@@ -474,7 +474,7 @@
},
]
- make_records(records, True)
+ make_records(records)
def get_fy_details(fy_start_date, fy_end_date):