Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #16633 from pratu16x7/explore-2.0

Browse Source 
feat(modules): Add getting started and help desk, merge settings
This commit is contained in:
Rushabh Mehta 2019-02-18 11:20:14 +05:30 committed by GitHub
commit 1a6668ef3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 374 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/config/accounting.py
View File

@ -108,7 +108,7 @@ def get_data():
},
{
"label": _("Setup"),
"label": _("Settings"),
"icon": "fa fa-cog",
"items": [
{
@ -174,7 +174,6 @@ def get_data():
"name": "General Ledger",
"doctype": "GL Entry",
"is_query_report": True,
"onboard": 1,
},
{
"type": "report",

2
erpnext/config/buying.py
View File

@ -78,7 +78,7 @@ def get_data():
]
},
{
"label": _("Setup"),
"label": _("Settings"),
"icon": "fa fa-cog",
"items": [
{

48
erpnext/config/crm.py
View File

@ -106,7 +106,7 @@ def get_data():
]
},
{
"label": _("Setup"),
"label": _("Settings"),
"icon": "fa fa-cog",
"items": [
{
@ -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",

63
erpnext/config/desktop.py
View File

@ -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, payments, cost center and budgeting."
},
{
"module_name": "Selling",
@ -24,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",
@ -34,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",
@ -44,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",
@ -54,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",
@ -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": "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 @@ 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",
@ -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."
},
@ -107,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",
@ -117,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",
@ -127,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."
},
{
@ -138,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",
@ -148,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",
@ -158,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."
},
{
@ -169,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",
@ -203,17 +223,6 @@ def get_data():
"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."
},
]

2
erpnext/config/education.py
View File

@ -198,7 +198,7 @@ def get_data():
]
},
{
"label": _("Setup"),
"label": _("Settings"),
"items": [
{
"type": "doctype",

261
erpnext/config/getting_started.py Normal file
View File

@ -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,
},
]
}
]

2
erpnext/config/healthcare.py
View File

@ -105,7 +105,7 @@ def get_data():
]
},
{
"label": _("Setup"),
"label": _("Settings"),
"icon": "icon-cog",
"items": [
{

2
erpnext/config/help.py
View File

@ -30,7 +30,7 @@ def get_data():
},
{
"label": _("Setup"),
"label": _("Settings"),
"items": [
{
"type": "help",

62
erpnext/config/help_desk.py Normal file
View File

@ -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
},
]
},
]

2
erpnext/config/hr.py
View File

@ -106,7 +106,7 @@ def get_data():
]
},
{
"label": _("Setup"),
"label": _("Settings"),
"icon": "fa fa-cog",
"items": [
{

2
erpnext/config/hub_node.py
View File

@ -4,7 +4,7 @@ from frappe import _
def get_data():
return [
{
"label": _("Setup"),
"label": _("Settings"),
"items": [
{
"type": "doctype",

2
erpnext/config/manufacturing.py
View File

@ -97,7 +97,7 @@ def get_data():
]
},
{
"label": _("Setup"),
"label": _("Settings"),
"items": [
{
"type": "doctype",

2
erpnext/config/selling.py
View File

@ -112,7 +112,7 @@ def get_data():
]
},
{
"label": _("Setup"),
"label": _("Settings"),
"icon": "fa fa-cog",
"items": [
{

2
erpnext/config/settings.py
View File

@ -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,

2
erpnext/config/stock.py
View File

@ -86,7 +86,7 @@ def get_data():
]
},
{
"label": _("Setup"),
"label": _("Settings"),
"icon": "fa fa-cog",
"items": [
{

6
erpnext/setup/setup_wizard/operations/install_fixtures.py
View File

@ -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):