From 01a045a488425122091eb8b8a77df3a201726e59 Mon Sep 17 00:00:00 2001 From: Prateeksha Singh Date: Mon, 11 Feb 2019 14:00:48 +0530 Subject: [PATCH 1/5] feat(modules): Add getting started and help desk --- erpnext/config/accounting.py | 1 - erpnext/config/crm.py | 46 --- erpnext/config/desktop.py | 26 +- erpnext/config/getting_started.py | 659 ++++++++++++++++++++++++++++++ erpnext/config/help_desk.py | 62 +++ erpnext/config/settings.py | 2 +- 6 files changed, 745 insertions(+), 51 deletions(-) create mode 100644 erpnext/config/getting_started.py create mode 100644 erpnext/config/help_desk.py diff --git a/erpnext/config/accounting.py b/erpnext/config/accounting.py index a8b944705b..cdd1610527 100644 --- a/erpnext/config/accounting.py +++ b/erpnext/config/accounting.py @@ -174,7 +174,6 @@ def get_data(): "name": "General Ledger", "doctype": "GL Entry", "is_query_report": True, - "onboard": 1, }, { "type": "report", diff --git a/erpnext/config/crm.py b/erpnext/config/crm.py index 3119824fdb..362d3aa150 100644 --- a/erpnext/config/crm.py +++ b/erpnext/config/crm.py @@ -158,52 +158,6 @@ def get_data(): } ] }, - { - "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", diff --git a/erpnext/config/desktop.py b/erpnext/config/desktop.py index fd5906a62a..7fbdd217ae 100644 --- a/erpnext/config/desktop.py +++ b/erpnext/config/desktop.py @@ -6,6 +6,16 @@ from frappe import _ def get_data(): 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", @@ -14,7 +24,7 @@ def get_data(): "icon": "octicon octicon-repo", "type": "module", "hidden": 1, - "description": "Accounts, Billing, Payments, Cost Center and Budgeting." + "description": "Accounts, billing, finances and payments; with cost center, taxes and budgeting." }, { "module_name": "Selling", @@ -74,7 +84,17 @@ def get_data(): "icon": "octicon octicon-broadcast", "type": "module", "hidden": 1, - "description": "Everything in your sales pipeline, from Leads to Customers, to Support." + "description": "Everything in your sales pipeline, from Leads and Opportunities to 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", @@ -94,7 +114,7 @@ def get_data(): "icon": "fa fa-check-square-o", "type": "module", "hidden": 1, - "description": "Volunteers, Memberships, Grants and Chapters." + "description": "Quality goals, procedures, reviews and action." }, diff --git a/erpnext/config/getting_started.py b/erpnext/config/getting_started.py new file mode 100644 index 0000000000..a785c6b7ed --- /dev/null +++ b/erpnext/config/getting_started.py @@ -0,0 +1,659 @@ +from __future__ import unicode_literals +from frappe import _ + +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": "Journal Entry", + "description": _("Accounting journal entries."), + "onboard": 1, + }, + { + "type": "doctype", + "name": "Opening Invoice Creation Tool", + "description": _("Create Opening Sales and Purchase Invoices") + }, + ] + }, + { + "label": _("Selling"), + "items": [ + { + "type": "doctype", + "name": "Customer", + "description": _("Customer database."), + "onboard": 1, + }, + { + "type": "doctype", + "name": "Quotation", + "description": _("Quotes to Leads or Customers."), + "onboard": 1, + "dependencies": ["Item", "Customer"], + }, + { + "type": "doctype", + "name": "Sales Order", + "description": _("Confirmed orders from Customers."), + "onboard": 1, + "dependencies": ["Item", "Customer"], + }, + { + "type": "doctype", + "name": "Sales Partner", + "description": _("Manage Sales Partners."), + "dependencies": ["Item"], + }, + { + "type": "doctype", + "name": "Selling Settings", + "description": _("Default settings for selling transactions."), + "onboard": 1, + }, + { + "type": "doctype", + "name":"Terms and Conditions", + "label": _("Terms and Conditions Template"), + "description": _("Template of terms or contract."), + "onboard": 1, + }, + ] + }, + { + "label": _("Buying"), + "items": [ + { + "type": "doctype", + "name": "Purchase Order", + "onboard": 1, + "dependencies": ["Item", "Supplier"], + "description": _("Purchase Orders given to Suppliers."), + }, + { + "type": "doctype", + "name": "Material Request", + "onboard": 1, + "dependencies": ["Item"], + "description": _("Request for purchase."), + }, + { + "type": "doctype", + "name": "Request for Quotation", + "onboard": 1, + "dependencies": ["Item", "Supplier"], + "description": _("Request for quotation."), + }, + { + "type": "doctype", + "name": "Supplier Quotation", + "dependencies": ["Item", "Supplier"], + "description": _("Quotations received from Suppliers."), + }, + { + "type": "doctype", + "name": "Buying Settings", + "onboard": 1, + "description": _("Default settings for buying transactions.") + }, + { + "type": "doctype", + "name": "Purchase Taxes and Charges Template", + "description": _("Tax template for buying transactions.") + }, + { + "type": "doctype", + "name":"Terms and Conditions", + "label": _("Terms and Conditions Template"), + "description": _("Template of terms or contract.") + }, + ] + }, + { + "label": _("Stock"), + "items": [ + { + "type": "doctype", + "name": "Stock Entry", + "onboard": 1, + "dependencies": ["Item"], + }, + { + "type": "doctype", + "name": "Delivery Note", + "onboard": 1, + "dependencies": ["Item", "Customer"], + }, + { + "type": "doctype", + "name": "Purchase Receipt", + "onboard": 1, + "dependencies": ["Item", "Supplier"], + }, + { + "type": "doctype", + "name": "Material Request", + "onboard": 1, + "dependencies": ["Item"], + }, + { + "type": "doctype", + "name": "Delivery Trip" + }, + ] + }, + { + "label": _("Assets"), + "items": [ + { + "type": "doctype", + "name": "Asset", + "onboard": 1, + }, + { + "type": "doctype", + "name": "Location", + "onboard": 1, + }, + { + "type": "doctype", + "name": "Asset Category", + "onboard": 1, + }, + { + "type": "doctype", + "name": "Asset Settings", + }, + { + "type": "doctype", + "name": "Asset Movement", + "description": _("Transfer an asset from one warehouse to another") + }, + ] + }, + { + "label": _("Projects"), + "items": [ + { + "type": "doctype", + "name": "Project", + "description": _("Project master."), + "onboard": 1, + }, + { + "type": "doctype", + "name": "Task", + "route": "List/Task", + "description": _("Project activity / task."), + "onboard": 1, + }, + { + "type": "report", + "route": "List/Task/Gantt", + "doctype": "Task", + "name": "Gantt Chart", + "description": _("Gantt chart of all tasks."), + "onboard": 1, + }, + { + "type": "doctype", + "name": "Project Update", + "description": _("Project Update."), + "dependencies": ["Project"], + }, + { + "type": "doctype", + "name": "Timesheet", + "description": _("Timesheet for tasks."), + "onboard": 1, + }, + ] + }, + { + "label": _("CRM"), + "items": [ + { + "type": "doctype", + "name": "Lead", + "description": _("Database of potential customers."), + "onboard": 1, + }, + { + "type": "doctype", + "name": "Opportunity", + "description": _("Potential opportunities for selling."), + "onboard": 1, + }, + { + "type": "doctype", + "name": "Customer", + "description": _("Customer database."), + "onboard": 1, + }, + { + "type": "doctype", + "name": "Contact", + "description": _("All Contacts."), + "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, + }, + { + "type": "doctype", + "label": _("Sales Person"), + "name": "Sales Person", + "icon": "fa fa-sitemap", + "link": "Tree/Sales Person", + "description": _("Manage Sales Person Tree."), + "onboard": 1, + }, + ] + }, + { + "label": _("Help Desk"), + "items": [ + { + "type": "doctype", + "name": "Issue", + "description": _("Support queries from customers."), + "onboard": 1, + }, + { + "type": "doctype", + "name": "Communication", + "description": _("Communication log."), + "onboard": 1, + }, + { + "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 + }, + ] + }, + { + "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": "Attendance", + "onboard": 1, + "dependencies": ["Employee"] + }, + { + "type": "doctype", + "name": "Salary Structure", + "onboard": 1, + }, + { + "type": "doctype", + "name": "Salary Structure Assignment", + "onboard": 1, + "dependencies": ["Salary Structure", "Employee"], + }, + { + "type": "doctype", + "name": "Salary Slip", + "onboard": 1, + }, + { + "type": "doctype", + "name": "Payroll Entry", + "onboard": 1, + }, + ] + }, + { + "label": _("Quality"), + "items": [ + { + "type": "doctype", + "name": "Quality Goal", + "description":_("Quality Goal."), + "onboard": 1, + }, + { + "type": "doctype", + "name": "Quality Procedure", + "description":_("Quality Procedure."), + "onboard": 1, + }, + { + "type": "doctype", + "name": "Quality Procedure", + "icon": "fa fa-sitemap", + "label": _("Tree of Procedures"), + "route": "Tree/Quality Procedure", + "description": _("Tree of Quality Procedures."), + }, + { + "type": "doctype", + "name": "Quality Review", + "description":_("Quality Review"), + "onboard": 1, + }, + { + "type": "doctype", + "name": "Quality Action", + "description":_("Quality Action"), + } + ] + }, + { + "label": _("Manufacturing"), + "items": [ + { + "type": "doctype", + "name": "Work Order", + "description": _("Orders released for production."), + "onboard": 1, + "dependencies": ["Item", "BOM"] + }, + { + "type": "doctype", + "name": "Production Plan", + "description": _("Generate Material Requests (MRP) and Work Orders."), + "onboard": 1, + "dependencies": ["Item", "BOM"] + }, + { + "type": "doctype", + "name": "Stock Entry", + "onboard": 1, + "dependencies": ["Item"] + }, + { + "type": "doctype", + "name": "Timesheet", + "description": _("Time Sheet for manufacturing."), + "onboard": 1, + "dependencies": ["Activity Type"] + }, + { + "type": "doctype", + "name": "Job Card" + }, + { + "type": "doctype", + "name": "Item", + "description": _("All Products or Services."), + "onboard": 1, + }, + { + "type": "doctype", + "name": "BOM", + "description": _("Bill of Materials (BOM)"), + "label": _("Bill of Materials"), + "onboard": 1, + "dependencies": ["Item"] + }, + ] + }, + { + "label": _("Retail"), + "items": [ + { + "type": "doctype", + "name": "POS Profile", + "label": _("Point-of-Sale Profile"), + "description": _("Setup default values for POS Invoices"), + "onboard": 1, + }, + { + "type": "page", + "name": "pos", + "label": _("POS"), + "description": _("Point of Sale"), + "onboard": 1, + "dependencies": ["POS Profile"] + }, + { + "type": "doctype", + "name": "Cashier Closing", + "description": _("Cashier Closing"), + "onboard": 1, + }, + { + "type": "doctype", + "name": "POS Settings", + "description": _("Setup mode of POS (Online / Offline)"), + "onboard": 1, + }, + { + "type": "doctype", + "name": "Loyalty Program", + "label": _("Loyalty Program"), + "description": _("To make Customer based incentive schemes.") + }, + { + "type": "doctype", + "name": "Loyalty Point Entry", + "label": _("Loyalty Point Entry"), + "description": _("To view logs of Loyalty Points assigned to a Customer.") + } + ] + }, + { + "label": _("Education"), + "items": [ + { + "type": "doctype", + "name": "Student", + "onboard": 1, + }, + { + "type": "doctype", + "name": "Guardian", + "onboard": 1, + }, + { + "type": "doctype", + "name": "Student Group", + "onboard": 1, + }, + { + "type": "doctype", + "name": "Student Attendance", + "onboard": 1, + }, + { + "type": "doctype", + "name": "Fees", + "onboard": 1, + }, + { + "type": "doctype", + "name": "Program Enrollment Tool" + }, + { + "type": "doctype", + "name": "Course Scheduling Tool" + }, + { + "type": "doctype", + "name": "Fee Schedule" + }, + ] + }, + { + "label": _("Healthcare"), + "items": [ + { + "type": "doctype", + "name": "Patient Appointment", + "label": _("Patient Appointment"), + "onboard": 1, + }, + { + "type": "doctype", + "name": "Patient Encounter", + "label": _("Patient Encounter"), + "onboard": 1, + }, + { + "type": "doctype", + "name": "Vital Signs", + "label": _("Vital Signs"), + "description": _("Record Patient Vitals"), + "onboard": 1, + }, + { + "type": "page", + "name": "medical_record", + "label": _("Patient Medical Record"), + "onboard": 1, + }, + { + "type": "page", + "name": "appointment-analytic", + "label": _("Appointment Analytics"), + "onboard": 1, + }, + { + "type": "doctype", + "name": "Clinical Procedure", + "label": _("Clinical Procedure"), + }, + { + "type": "doctype", + "name": "Inpatient Record", + "label": _("Inpatient Record"), + } + ] + }, + { + "label": _("Agriculture"), + "items": [ + { + "type": "doctype", + "name": "Crop", + "onboard": 1, + }, + { + "type": "doctype", + "name": "Crop Cycle", + "onboard": 1, + }, + { + "type": "doctype", + "name": "Location", + "onboard": 1, + }, + { + "type": "doctype", + "name": "Disease", + "onboard": 1, + }, + { + "type": "doctype", + "name": "Fertilizer", + "onboard": 1, + } + ] + }, + { + "label": _("Non Profit"), + "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/help_desk.py b/erpnext/config/help_desk.py new file mode 100644 index 0000000000..adc84f2169 --- /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/settings.py b/erpnext/config/settings.py index 0bbf6ec7ef..179586f183 100644 --- a/erpnext/config/settings.py +++ b/erpnext/config/settings.py @@ -11,7 +11,7 @@ def get_data(): { "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, From 9d4a183074e6c5382a4ffe562a89e549be9c9603 Mon Sep 17 00:00:00 2001 From: Prateeksha Singh Date: Mon, 11 Feb 2019 15:14:50 +0530 Subject: [PATCH 2/5] fix(modules): Merge Settings into one, Setup --> Settings --- erpnext/config/accounting.py | 2 +- erpnext/config/buying.py | 2 +- erpnext/config/crm.py | 2 +- erpnext/config/desktop.py | 11 ----------- erpnext/config/education.py | 2 +- erpnext/config/healthcare.py | 2 +- erpnext/config/help.py | 2 +- erpnext/config/hr.py | 2 +- erpnext/config/hub_node.py | 2 +- erpnext/config/manufacturing.py | 2 +- erpnext/config/selling.py | 2 +- erpnext/config/stock.py | 2 +- 12 files changed, 11 insertions(+), 22 deletions(-) diff --git a/erpnext/config/accounting.py b/erpnext/config/accounting.py index cdd1610527..9de5b368db 100644 --- a/erpnext/config/accounting.py +++ b/erpnext/config/accounting.py @@ -108,7 +108,7 @@ def get_data(): }, { - "label": _("Setup"), + "label": _("Settings"), "icon": "fa fa-cog", "items": [ { diff --git a/erpnext/config/buying.py b/erpnext/config/buying.py index c52b9a2a1f..9d1eda5d7b 100644 --- a/erpnext/config/buying.py +++ b/erpnext/config/buying.py @@ -78,7 +78,7 @@ def get_data(): ] }, { - "label": _("Setup"), + "label": _("Settings"), "icon": "fa fa-cog", "items": [ { diff --git a/erpnext/config/crm.py b/erpnext/config/crm.py index 362d3aa150..e49fc60f63 100644 --- a/erpnext/config/crm.py +++ b/erpnext/config/crm.py @@ -106,7 +106,7 @@ def get_data(): ] }, { - "label": _("Setup"), + "label": _("Settings"), "icon": "fa fa-cog", "items": [ { diff --git a/erpnext/config/desktop.py b/erpnext/config/desktop.py index 7fbdd217ae..cb88cf34c5 100644 --- a/erpnext/config/desktop.py +++ b/erpnext/config/desktop.py @@ -225,15 +225,4 @@ def get_data(): '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." - }, ] diff --git a/erpnext/config/education.py b/erpnext/config/education.py index 5a05a258b2..96e7e8118e 100644 --- a/erpnext/config/education.py +++ b/erpnext/config/education.py @@ -198,7 +198,7 @@ def get_data(): ] }, { - "label": _("Setup"), + "label": _("Settings"), "items": [ { "type": "doctype", diff --git a/erpnext/config/healthcare.py b/erpnext/config/healthcare.py index e55f736481..de0167bb98 100644 --- a/erpnext/config/healthcare.py +++ b/erpnext/config/healthcare.py @@ -105,7 +105,7 @@ def get_data(): ] }, { - "label": _("Setup"), + "label": _("Settings"), "icon": "icon-cog", "items": [ { diff --git a/erpnext/config/help.py b/erpnext/config/help.py index 1353892664..922afb4c49 100644 --- a/erpnext/config/help.py +++ b/erpnext/config/help.py @@ -30,7 +30,7 @@ def get_data(): }, { - "label": _("Setup"), + "label": _("Settings"), "items": [ { "type": "help", diff --git a/erpnext/config/hr.py b/erpnext/config/hr.py index 93a9f4106d..f517a5e7c0 100644 --- a/erpnext/config/hr.py +++ b/erpnext/config/hr.py @@ -106,7 +106,7 @@ def get_data(): ] }, { - "label": _("Setup"), + "label": _("Settings"), "icon": "fa fa-cog", "items": [ { diff --git a/erpnext/config/hub_node.py b/erpnext/config/hub_node.py index 9b9fcc456c..0afdeb52b1 100644 --- a/erpnext/config/hub_node.py +++ b/erpnext/config/hub_node.py @@ -4,7 +4,7 @@ from frappe import _ def get_data(): return [ { - "label": _("Setup"), + "label": _("Settings"), "items": [ { "type": "doctype", diff --git a/erpnext/config/manufacturing.py b/erpnext/config/manufacturing.py index e1b6980ac5..da60550221 100644 --- a/erpnext/config/manufacturing.py +++ b/erpnext/config/manufacturing.py @@ -97,7 +97,7 @@ def get_data(): ] }, { - "label": _("Setup"), + "label": _("Settings"), "items": [ { "type": "doctype", diff --git a/erpnext/config/selling.py b/erpnext/config/selling.py index 9e190a730a..1b9a7a087f 100644 --- a/erpnext/config/selling.py +++ b/erpnext/config/selling.py @@ -112,7 +112,7 @@ def get_data(): ] }, { - "label": _("Setup"), + "label": _("Settings"), "icon": "fa fa-cog", "items": [ { diff --git a/erpnext/config/stock.py b/erpnext/config/stock.py index 6c06733d93..117b61578d 100644 --- a/erpnext/config/stock.py +++ b/erpnext/config/stock.py @@ -86,7 +86,7 @@ def get_data(): ] }, { - "label": _("Setup"), + "label": _("Settings"), "icon": "fa fa-cog", "items": [ { From 08a6de6b4119e308f6f6255eea6f41ebd8d7ccd1 Mon Sep 17 00:00:00 2001 From: Prateeksha Singh Date: Tue, 12 Feb 2019 07:41:52 +0530 Subject: [PATCH 3/5] fix(modules): shorten descriptions --- erpnext/config/desktop.py | 30 +++++++++---------- .../operations/install_fixtures.py | 6 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/erpnext/config/desktop.py b/erpnext/config/desktop.py index cb88cf34c5..5d4dfa1687 100644 --- a/erpnext/config/desktop.py +++ b/erpnext/config/desktop.py @@ -24,7 +24,7 @@ def get_data(): "icon": "octicon octicon-repo", "type": "module", "hidden": 1, - "description": "Accounts, billing, finances and payments; with cost center, taxes and budgeting." + "description": "Accounts, billing, payments, cost center and budgeting." }, { "module_name": "Selling", @@ -34,7 +34,7 @@ def get_data(): "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", @@ -44,7 +44,7 @@ def get_data(): "icon": "octicon octicon-briefcase", "type": "module", "hidden": 1, - "description": "Purchasing, Suppliers and Products." + "description": "Purchasing, suppliers, material requests, and items." }, { "module_name": "Stock", @@ -54,7 +54,7 @@ def get_data(): "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", @@ -64,7 +64,7 @@ def get_data(): "icon": "octicon octicon-database", "hidden": 1, "type": "module", - "description": "Asset Maintainance and Tools." + "description": "Asset movement, maintainance and tools." }, { "module_name": "Projects", @@ -84,7 +84,7 @@ def get_data(): "icon": "octicon octicon-broadcast", "type": "module", "hidden": 1, - "description": "Everything in your sales pipeline, from Leads and Opportunities to Customers." + "description": "Sales pipeline, leads, opportunities and customers." }, { "module_name": "Help Desk", @@ -104,7 +104,7 @@ def get_data(): "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", @@ -127,7 +127,7 @@ def get_data(): "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", @@ -137,7 +137,7 @@ def get_data(): "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", @@ -147,7 +147,7 @@ def get_data(): "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." }, { @@ -158,7 +158,7 @@ def get_data(): "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", @@ -168,7 +168,7 @@ def get_data(): "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", @@ -178,7 +178,7 @@ def get_data(): "icon": "fa fa-bed", "type": "module", "hidden": 1, - "description": "Manage Hotel Rooms, Pricing, Reservation and Amenities." + "description": "Hotel rooms, pricing, reservation and amenities." }, { @@ -189,7 +189,7 @@ def get_data(): "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", @@ -223,6 +223,6 @@ def get_data(): "link": '#marketplace/home', "color": '#FF4136', 'standard': 1, - "description": "Publish items to other ERPNext users and start a conversation." + "description": "Publish items to other ERPNext users." }, ] diff --git a/erpnext/setup/setup_wizard/operations/install_fixtures.py b/erpnext/setup/setup_wizard/operations/install_fixtures.py index 6009bccb4d..d21de0ef36 100644 --- a/erpnext/setup/setup_wizard/operations/install_fixtures.py +++ b/erpnext/setup/setup_wizard/operations/install_fixtures.py @@ -252,7 +252,7 @@ def install(country=None): 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 @@ def install_company(args): } ] - make_records(records, True) + make_records(records) def install_post_company_fixtures(args=None): @@ -474,7 +474,7 @@ def install_defaults(args=None): }, ] - make_records(records, True) + make_records(records) def get_fy_details(fy_start_date, fy_end_date): From 9adad2988de6b2967fd55c5acf69ff00ecc0035e Mon Sep 17 00:00:00 2001 From: Prateeksha Singh Date: Tue, 12 Feb 2019 08:37:53 +0530 Subject: [PATCH 4/5] feat(getting_started): Minimum requirements to setup --- erpnext/config/getting_started.py | 449 ++---------------------------- 1 file changed, 26 insertions(+), 423 deletions(-) diff --git a/erpnext/config/getting_started.py b/erpnext/config/getting_started.py index a785c6b7ed..e27ac12843 100644 --- a/erpnext/config/getting_started.py +++ b/erpnext/config/getting_started.py @@ -1,6 +1,9 @@ from __future__ import unicode_literals +import frappe from frappe import _ +active_domains = frappe.get_active_domains() + def get_data(): return [ { @@ -38,110 +41,38 @@ def get_data(): "description": _("Tree of financial accounts."), "onboard": 1, }, - { - "type": "doctype", - "name": "Journal Entry", - "description": _("Accounting journal entries."), - "onboard": 1, - }, { "type": "doctype", "name": "Opening Invoice Creation Tool", - "description": _("Create Opening Sales and Purchase Invoices") - }, - ] - }, - { - "label": _("Selling"), - "items": [ - { - "type": "doctype", - "name": "Customer", - "description": _("Customer database."), - "onboard": 1, - }, - { - "type": "doctype", - "name": "Quotation", - "description": _("Quotes to Leads or Customers."), - "onboard": 1, - "dependencies": ["Item", "Customer"], - }, - { - "type": "doctype", - "name": "Sales Order", - "description": _("Confirmed orders from Customers."), - "onboard": 1, - "dependencies": ["Item", "Customer"], - }, - { - "type": "doctype", - "name": "Sales Partner", - "description": _("Manage Sales Partners."), - "dependencies": ["Item"], - }, - { - "type": "doctype", - "name": "Selling Settings", - "description": _("Default settings for selling transactions."), - "onboard": 1, - }, - { - "type": "doctype", - "name":"Terms and Conditions", - "label": _("Terms and Conditions Template"), - "description": _("Template of terms or contract."), + "description": _("Create Opening Sales and Purchase Invoices"), "onboard": 1, }, ] }, { - "label": _("Buying"), + "label": _("Data Import and Settings"), "items": [ { "type": "doctype", - "name": "Purchase Order", + "name": "Data Import", + "label": _("Import Data"), + "icon": "octicon octicon-cloud-upload", + "description": _("Import Data from CSV / Excel files."), "onboard": 1, - "dependencies": ["Item", "Supplier"], - "description": _("Purchase Orders given to Suppliers."), }, { "type": "doctype", - "name": "Material Request", + "name": "Letter Head", + "description": _("Letter Heads for print templates."), "onboard": 1, - "dependencies": ["Item"], - "description": _("Request for purchase."), }, { "type": "doctype", - "name": "Request for Quotation", + "name": "Email Account", + "description": _("Add / Manage Email Accounts."), "onboard": 1, - "dependencies": ["Item", "Supplier"], - "description": _("Request for quotation."), - }, - { - "type": "doctype", - "name": "Supplier Quotation", - "dependencies": ["Item", "Supplier"], - "description": _("Quotations received from Suppliers."), - }, - { - "type": "doctype", - "name": "Buying Settings", - "onboard": 1, - "description": _("Default settings for buying transactions.") - }, - { - "type": "doctype", - "name": "Purchase Taxes and Charges Template", - "description": _("Tax template for buying transactions.") - }, - { - "type": "doctype", - "name":"Terms and Conditions", - "label": _("Terms and Conditions Template"), - "description": _("Template of terms or contract.") }, + ] }, { @@ -149,97 +80,23 @@ def get_data(): "items": [ { "type": "doctype", - "name": "Stock Entry", - "onboard": 1, - "dependencies": ["Item"], - }, - { - "type": "doctype", - "name": "Delivery Note", - "onboard": 1, - "dependencies": ["Item", "Customer"], - }, - { - "type": "doctype", - "name": "Purchase Receipt", - "onboard": 1, - "dependencies": ["Item", "Supplier"], - }, - { - "type": "doctype", - "name": "Material Request", - "onboard": 1, - "dependencies": ["Item"], - }, - { - "type": "doctype", - "name": "Delivery Trip" - }, - ] - }, - { - "label": _("Assets"), - "items": [ - { - "type": "doctype", - "name": "Asset", + "name": "Warehouse", "onboard": 1, }, { "type": "doctype", - "name": "Location", + "name": "Brand", "onboard": 1, }, { "type": "doctype", - "name": "Asset Category", + "name": "UOM", + "label": _("Unit of Measure") + " (UOM)", "onboard": 1, }, { "type": "doctype", - "name": "Asset Settings", - }, - { - "type": "doctype", - "name": "Asset Movement", - "description": _("Transfer an asset from one warehouse to another") - }, - ] - }, - { - "label": _("Projects"), - "items": [ - { - "type": "doctype", - "name": "Project", - "description": _("Project master."), - "onboard": 1, - }, - { - "type": "doctype", - "name": "Task", - "route": "List/Task", - "description": _("Project activity / task."), - "onboard": 1, - }, - { - "type": "report", - "route": "List/Task/Gantt", - "doctype": "Task", - "name": "Gantt Chart", - "description": _("Gantt chart of all tasks."), - "onboard": 1, - }, - { - "type": "doctype", - "name": "Project Update", - "description": _("Project Update."), - "dependencies": ["Project"], - }, - { - "type": "doctype", - "name": "Timesheet", - "description": _("Timesheet for tasks."), + "name": "Stock Reconciliation", "onboard": 1, }, ] @@ -259,18 +116,6 @@ def get_data(): "description": _("Potential opportunities for selling."), "onboard": 1, }, - { - "type": "doctype", - "name": "Customer", - "description": _("Customer database."), - "onboard": 1, - }, - { - "type": "doctype", - "name": "Contact", - "description": _("All Contacts."), - "onboard": 1, - }, { "type": "doctype", "label": _("Customer Group"), @@ -289,50 +134,6 @@ def get_data(): "description": _("Manage Territory Tree."), "onboard": 1, }, - { - "type": "doctype", - "label": _("Sales Person"), - "name": "Sales Person", - "icon": "fa fa-sitemap", - "link": "Tree/Sales Person", - "description": _("Manage Sales Person Tree."), - "onboard": 1, - }, - ] - }, - { - "label": _("Help Desk"), - "items": [ - { - "type": "doctype", - "name": "Issue", - "description": _("Support queries from customers."), - "onboard": 1, - }, - { - "type": "doctype", - "name": "Communication", - "description": _("Communication log."), - "onboard": 1, - }, - { - "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 - }, ] }, { @@ -350,167 +151,16 @@ def get_data(): "onboard": 1, "dependencies": ["Employee"] }, - { - "type": "doctype", - "name": "Attendance", - "onboard": 1, - "dependencies": ["Employee"] - }, { "type": "doctype", "name": "Salary Structure", "onboard": 1, }, - { - "type": "doctype", - "name": "Salary Structure Assignment", - "onboard": 1, - "dependencies": ["Salary Structure", "Employee"], - }, - { - "type": "doctype", - "name": "Salary Slip", - "onboard": 1, - }, - { - "type": "doctype", - "name": "Payroll Entry", - "onboard": 1, - }, - ] - }, - { - "label": _("Quality"), - "items": [ - { - "type": "doctype", - "name": "Quality Goal", - "description":_("Quality Goal."), - "onboard": 1, - }, - { - "type": "doctype", - "name": "Quality Procedure", - "description":_("Quality Procedure."), - "onboard": 1, - }, - { - "type": "doctype", - "name": "Quality Procedure", - "icon": "fa fa-sitemap", - "label": _("Tree of Procedures"), - "route": "Tree/Quality Procedure", - "description": _("Tree of Quality Procedures."), - }, - { - "type": "doctype", - "name": "Quality Review", - "description":_("Quality Review"), - "onboard": 1, - }, - { - "type": "doctype", - "name": "Quality Action", - "description":_("Quality Action"), - } - ] - }, - { - "label": _("Manufacturing"), - "items": [ - { - "type": "doctype", - "name": "Work Order", - "description": _("Orders released for production."), - "onboard": 1, - "dependencies": ["Item", "BOM"] - }, - { - "type": "doctype", - "name": "Production Plan", - "description": _("Generate Material Requests (MRP) and Work Orders."), - "onboard": 1, - "dependencies": ["Item", "BOM"] - }, - { - "type": "doctype", - "name": "Stock Entry", - "onboard": 1, - "dependencies": ["Item"] - }, - { - "type": "doctype", - "name": "Timesheet", - "description": _("Time Sheet for manufacturing."), - "onboard": 1, - "dependencies": ["Activity Type"] - }, - { - "type": "doctype", - "name": "Job Card" - }, - { - "type": "doctype", - "name": "Item", - "description": _("All Products or Services."), - "onboard": 1, - }, - { - "type": "doctype", - "name": "BOM", - "description": _("Bill of Materials (BOM)"), - "label": _("Bill of Materials"), - "onboard": 1, - "dependencies": ["Item"] - }, - ] - }, - { - "label": _("Retail"), - "items": [ - { - "type": "doctype", - "name": "POS Profile", - "label": _("Point-of-Sale Profile"), - "description": _("Setup default values for POS Invoices"), - "onboard": 1, - }, - { - "type": "page", - "name": "pos", - "label": _("POS"), - "description": _("Point of Sale"), - "onboard": 1, - "dependencies": ["POS Profile"] - }, - { - "type": "doctype", - "name": "Cashier Closing", - "description": _("Cashier Closing"), - "onboard": 1, - }, - { - "type": "doctype", - "name": "POS Settings", - "description": _("Setup mode of POS (Online / Offline)"), - "onboard": 1, - }, - { - "type": "doctype", - "name": "Loyalty Program", - "label": _("Loyalty Program"), - "description": _("To make Customer based incentive schemes.") - }, - { - "type": "doctype", - "name": "Loyalty Point Entry", - "label": _("Loyalty Point Entry"), - "description": _("To view logs of Loyalty Points assigned to a Customer.") - } ] }, { "label": _("Education"), + "condition": "Education" in active_domains, "items": [ { "type": "doctype", @@ -519,7 +169,7 @@ def get_data(): }, { "type": "doctype", - "name": "Guardian", + "name": "Course", "onboard": 1, }, { @@ -527,32 +177,11 @@ def get_data(): "name": "Student Group", "onboard": 1, }, - { - "type": "doctype", - "name": "Student Attendance", - "onboard": 1, - }, - { - "type": "doctype", - "name": "Fees", - "onboard": 1, - }, - { - "type": "doctype", - "name": "Program Enrollment Tool" - }, - { - "type": "doctype", - "name": "Course Scheduling Tool" - }, - { - "type": "doctype", - "name": "Fee Schedule" - }, ] }, { "label": _("Healthcare"), + "condition": "Healthcare" in active_domains, "items": [ { "type": "doctype", @@ -560,45 +189,23 @@ def get_data(): "label": _("Patient Appointment"), "onboard": 1, }, - { - "type": "doctype", - "name": "Patient Encounter", - "label": _("Patient Encounter"), - "onboard": 1, - }, - { - "type": "doctype", - "name": "Vital Signs", - "label": _("Vital Signs"), - "description": _("Record Patient Vitals"), - "onboard": 1, - }, - { - "type": "page", - "name": "medical_record", - "label": _("Patient Medical Record"), - "onboard": 1, - }, - { - "type": "page", - "name": "appointment-analytic", - "label": _("Appointment Analytics"), - "onboard": 1, - }, { "type": "doctype", "name": "Clinical Procedure", "label": _("Clinical Procedure"), + "onboard": 1, }, { "type": "doctype", "name": "Inpatient Record", "label": _("Inpatient Record"), + "onboard": 1, } ] }, { "label": _("Agriculture"), + "condition": "Agriculture" in active_domains, "items": [ { "type": "doctype", @@ -615,11 +222,6 @@ def get_data(): "name": "Location", "onboard": 1, }, - { - "type": "doctype", - "name": "Disease", - "onboard": 1, - }, { "type": "doctype", "name": "Fertilizer", @@ -629,6 +231,7 @@ def get_data(): }, { "label": _("Non Profit"), + "condition": "Non Profit" in active_domains, "items": [ { "type": "doctype", From 426468183f4eced565d9382296313e157360fa9a Mon Sep 17 00:00:00 2001 From: Prateeksha Singh Date: Tue, 12 Feb 2019 13:08:21 +0530 Subject: [PATCH 5/5] fix(getting_started): main domain specific masters --- erpnext/config/getting_started.py | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/erpnext/config/getting_started.py b/erpnext/config/getting_started.py index e27ac12843..19b71d2168 100644 --- a/erpnext/config/getting_started.py +++ b/erpnext/config/getting_started.py @@ -110,12 +110,6 @@ def get_data(): "description": _("Database of potential customers."), "onboard": 1, }, - { - "type": "doctype", - "name": "Opportunity", - "description": _("Potential opportunities for selling."), - "onboard": 1, - }, { "type": "doctype", "label": _("Customer Group"), @@ -174,7 +168,12 @@ def get_data(): }, { "type": "doctype", - "name": "Student Group", + "name": "Instructor", + "onboard": 1, + }, + { + "type": "doctype", + "name": "Room", "onboard": 1, }, ] @@ -185,20 +184,20 @@ def get_data(): "items": [ { "type": "doctype", - "name": "Patient Appointment", - "label": _("Patient Appointment"), + "name": "Patient", + "label": _("Patient"), "onboard": 1, }, { "type": "doctype", - "name": "Clinical Procedure", - "label": _("Clinical Procedure"), + "name": "Physician", + "label": _("Physician"), "onboard": 1, }, { "type": "doctype", - "name": "Inpatient Record", - "label": _("Inpatient Record"), + "name": "Diagnosis", + "label": _("Diagnosis"), "onboard": 1, } ]