[redesign] modules
diff --git a/erpnext/config/accounts.py b/erpnext/config/accounts.py
index e243cf1..bbc8671 100644
--- a/erpnext/config/accounts.py
+++ b/erpnext/config/accounts.py
@@ -4,16 +4,10 @@
def get_data():
return [
{
- "label": _("Documents"),
- "icon": "icon-star",
+ "label": _("Billing"),
"items": [
{
"type": "doctype",
- "name": "Journal Entry",
- "description": _("Accounting journal entries.")
- },
- {
- "type": "doctype",
"name": "Sales Invoice",
"description": _("Bills raised to Customers.")
},
@@ -24,6 +18,59 @@
},
{
"type": "doctype",
+ "name": "Payment Request",
+ "description": _("Payment Request")
+ },
+ {
+ "type": "report",
+ "name": "Accounts Receivable",
+ "doctype": "Sales Invoice",
+ "is_query_report": True
+ },
+ {
+ "type": "report",
+ "name": "Accounts Payable",
+ "doctype": "Purchase Invoice",
+ "is_query_report": True
+ },
+ ]
+
+ },
+ {
+ "label": _("Company and Accounts"),
+ "items": [
+ {
+ "type": "doctype",
+ "name": "Company",
+ "description": _("Company (not Customer or Supplier) master.")
+ },
+ {
+ "type": "doctype",
+ "name": "Journal Entry",
+ "description": _("Accounting journal entries.")
+ },
+ {
+ "type": "page",
+ "name": "Accounts Browser",
+ "icon": "icon-sitemap",
+ "label": _("Chart of Accounts"),
+ "route": "Accounts Browser/Account",
+ "description": _("Tree of financial accounts."),
+ "doctype": "Account",
+ },
+ {
+ "type": "report",
+ "name":"General Ledger",
+ "doctype": "GL Entry",
+ "is_query_report": True,
+ },
+ ]
+ },
+ {
+ "label": _("Masters"),
+ "items": [
+ {
+ "type": "doctype",
"name": "Customer",
"description": _("Customer database.")
},
@@ -34,95 +81,78 @@
},
{
"type": "doctype",
- "name": "Payment Request",
- "description": _("Payment Request")
- },
- {
- "type": "page",
- "name": "Accounts Browser",
- "icon": "icon-sitemap",
- "label": _("Chart of Accounts"),
- "route": "Accounts Browser/Account",
- "description": _("Tree of financial accounts."),
- "doctype": "Account",
+ "name": "Item",
},
]
},
{
- "label": _("Tools"),
- "icon": "icon-wrench",
+ "label": _("Accounting Statements"),
"items": [
{
- "type": "doctype",
- "name": "Bank Reconciliation",
- "description": _("Update bank payment dates with journals.")
+ "type": "report",
+ "name": "Trial Balance",
+ "doctype": "GL Entry",
+ "is_query_report": True,
},
{
- "type": "doctype",
- "name": "Payment Reconciliation",
- "description": _("Match non-linked Invoices and Payments.")
+ "type": "report",
+ "name": "Balance Sheet",
+ "doctype": "GL Entry",
+ "is_query_report": True
},
{
- "type": "doctype",
- "name": "Period Closing Voucher",
- "description": _("Close Balance Sheet and book Profit or Loss.")
+ "type": "report",
+ "name": "Cash Flow",
+ "doctype": "GL Entry",
+ "is_query_report": True
},
{
+ "type": "report",
+ "name": "Profit and Loss Statement",
+ "doctype": "GL Entry",
+ "is_query_report": True
+ },
+ ]
+ },
+ {
+ "label": _("Banking and Payments"),
+ "items": [
+ {
"type": "doctype",
"name": "Payment Tool",
"description": _("Create Payment Entries against Orders or Invoices.")
},
+ {
+ "type": "doctype",
+ "label": _("Update Bank Transaction Dates"),
+ "name": "Bank Reconciliation",
+ "description": _("Update bank payment dates with journals.")
+ },
+ {
+ "type": "doctype",
+ "label": _("Match Payments with Invoices"),
+ "name": "Payment Reconciliation",
+ "description": _("Match non-linked Invoices and Payments.")
+ },
+ {
+ "type": "report",
+ "name": "Bank Reconciliation Statement",
+ "is_query_report": True,
+ "doctype": "Journal Entry"
+ },
+ {
+ "type": "report",
+ "name": "Bank Clearance Summary",
+ "is_query_report": True,
+ "doctype": "Journal Entry"
+ },
]
},
{
- "label": _("Setup"),
- "icon": "icon-cog",
+ "label": _("Taxes"),
"items": [
{
"type": "doctype",
- "name": "Company",
- "description": _("Company (not Customer or Supplier) master.")
- },
- {
- "type": "doctype",
- "name": "Fiscal Year",
- "description": _("Financial / accounting year.")
- },
- {
- "type": "doctype",
- "name": "Payment Gateway Account",
- "description": _("Setup Gateway accounts.")
- },
- {
- "type": "page",
- "name": "Accounts Browser",
- "icon": "icon-sitemap",
- "label": _("Chart of Accounts"),
- "route": "Accounts Browser/Account",
- "description": _("Tree of financial accounts."),
- "doctype": "Account",
- },
- {
- "type": "page",
- "name": "Accounts Browser",
- "icon": "icon-sitemap",
- "label": _("Chart of Cost Centers"),
- "route": "Accounts Browser/Cost Center",
- "description": _("Tree of financial Cost Centers."),
- "doctype": "Cost Center",
- },
- {
- "type": "doctype",
- "name": "Accounts Settings",
- "description": _("Default settings for accounting transactions.")
- },
- {
- "type": "doctype",
- "name": "Tax Rule",
- "description": _("Tax Rule for transactions.")
- },
- {
- "type": "doctype",
"name": "Sales Taxes and Charges Template",
"description": _("Tax template for selling transactions.")
},
@@ -133,19 +163,71 @@
},
{
"type": "doctype",
- "name": "POS Profile",
- "label": _("Point-of-Sale Profile"),
- "description": _("Rules to calculate shipping amount for a sale")
+ "name": "Tax Rule",
+ "description": _("Tax Rule for transactions.")
+ },
+ {
+ "type": "report",
+ "name": "Sales Register",
+ "doctype": "Sales Invoice",
+ "is_query_report": True
+ },
+ {
+ "type": "report",
+ "name": "Purchase Register",
+ "doctype": "Purchase Invoice",
+ "is_query_report": True
+ },
+ ]
+ },
+ {
+ "label": _("Budget and Cost Center"),
+ "items": [
+ {
+ "type": "page",
+ "name": "Accounts Browser",
+ "icon": "icon-sitemap",
+ "label": _("Chart of Cost Centers"),
+ "route": "Accounts Browser/Cost Center",
+ "description": _("Tree of financial Cost Centers."),
+ "doctype": "Cost Center",
+ },
+ {
+ "type": "report",
+ "name": "Budget Variance Report",
+ "is_query_report": True,
+ "doctype": "Cost Center"
+ },
+ {
+ "type":"doctype",
+ "name": "Monthly Distribution",
+ "description": _("Seasonality for setting budgets, targets etc.")
+ },
+ ]
+ },
+ {
+ "label": _("Tools"),
+ "items": [
+ {
+ "type": "doctype",
+ "name": "Period Closing Voucher",
+ "description": _("Close Balance Sheet and book Profit or Loss.")
+ },
+ ]
+ },
+ {
+ "label": _("Setup"),
+ "icon": "icon-cog",
+ "items": [
+ {
+ "type": "doctype",
+ "name": "Accounts Settings",
+ "description": _("Default settings for accounting transactions.")
},
{
"type": "doctype",
- "name": "Shipping Rule",
- "description": _("Rules for adding shipping costs.")
- },
- {
- "type": "doctype",
- "name": "Pricing Rule",
- "description": _("Rules for applying pricing and discount.")
+ "name": "Fiscal Year",
+ "description": _("Financial / accounting year.")
},
{
"type": "doctype",
@@ -158,9 +240,15 @@
"description": _("Currency exchange rate master.")
},
{
- "type":"doctype",
- "name": "Monthly Distribution",
- "description": _("Seasonality for setting budgets, targets etc.")
+ "type": "doctype",
+ "name": "Payment Gateway Account",
+ "description": _("Setup Gateway accounts.")
+ },
+ {
+ "type": "doctype",
+ "name": "POS Profile",
+ "label": _("Point-of-Sale Profile"),
+ "description": _("Rules to calculate shipping amount for a sale")
},
{
"type": "doctype",
@@ -182,95 +270,10 @@
]
},
{
- "label": _("Main Reports"),
- "icon": "icon-table",
+ "label": _("To Bill"),
"items": [
{
"type": "report",
- "name":"General Ledger",
- "doctype": "GL Entry",
- "is_query_report": True,
- },
- {
- "type": "report",
- "name": "Trial Balance",
- "doctype": "GL Entry",
- "is_query_report": True,
- },
- {
- "type": "report",
- "name": "Trial Balance for Party",
- "doctype": "GL Entry",
- "is_query_report": True,
- },
- {
- "type": "report",
- "name": "Gross Profit",
- "doctype": "Sales Invoice",
- "is_query_report": True
- },
- {
- "type": "report",
- "name": "Accounts Receivable",
- "doctype": "Sales Invoice",
- "is_query_report": True
- },
- {
- "type": "report",
- "name": "Accounts Payable",
- "doctype": "Purchase Invoice",
- "is_query_report": True
- },
- {
- "type": "report",
- "name": "Sales Register",
- "doctype": "Sales Invoice",
- "is_query_report": True
- },
- {
- "type": "report",
- "name": "Purchase Register",
- "doctype": "Purchase Invoice",
- "is_query_report": True
- },
- {
- "type": "report",
- "name": "Balance Sheet",
- "doctype": "GL Entry",
- "is_query_report": True
- },
- {
- "type": "report",
- "name": "Cash Flow",
- "doctype": "GL Entry",
- "is_query_report": True
- },
- {
- "type": "report",
- "name": "Profit and Loss Statement",
- "doctype": "GL Entry",
- "is_query_report": True
- },
- {
- "type": "page",
- "name": "financial-analytics",
- "label": _("Financial Analytics"),
- "icon": "icon-bar-chart",
- }
- ]
- },
- {
- "label": _("Standard Reports"),
- "icon": "icon-list",
- "items": [
- {
- "type": "report",
- "name": "Bank Reconciliation Statement",
- "is_query_report": True,
- "doctype": "Journal Entry"
- },
- {
- "type": "report",
"name": "Ordered Items To Be Billed",
"is_query_report": True,
"doctype": "Sales Invoice"
@@ -293,11 +296,47 @@
"is_query_report": True,
"doctype": "Purchase Invoice"
},
+ ]
+
+ },
+ {
+ "label": _("Analytics"),
+ "items": [
+ {
+ "type": "page",
+ "name": "financial-analytics",
+ "label": _("Financial Analytics"),
+ "icon": "icon-bar-chart",
+ },
{
"type": "report",
- "name": "Bank Clearance Summary",
+ "name": "Gross Profit",
+ "doctype": "Sales Invoice",
+ "is_query_report": True
+ },
+ {
+ "type": "report",
+ "name": "Purchase Invoice Trends",
"is_query_report": True,
- "doctype": "Journal Entry"
+ "doctype": "Purchase Invoice"
+ },
+ {
+ "type": "report",
+ "name": "Sales Invoice Trends",
+ "is_query_report": True,
+ "doctype": "Sales Invoice"
+ },
+ ]
+ },
+ {
+ "label": _("Other Reports"),
+ "icon": "icon-table",
+ "items": [
+ {
+ "type": "report",
+ "name": "Trial Balance for Party",
+ "doctype": "GL Entry",
+ "is_query_report": True,
},
{
"type": "report",
@@ -325,24 +364,6 @@
},
{
"type": "report",
- "name": "Budget Variance Report",
- "is_query_report": True,
- "doctype": "Cost Center"
- },
- {
- "type": "report",
- "name": "Purchase Invoice Trends",
- "is_query_report": True,
- "doctype": "Purchase Invoice"
- },
- {
- "type": "report",
- "name": "Sales Invoice Trends",
- "is_query_report": True,
- "doctype": "Sales Invoice"
- },
- {
- "type": "report",
"name": "Accounts Receivable Summary",
"doctype": "Sales Invoice",
"is_query_report": True
diff --git a/erpnext/config/buying.py b/erpnext/config/buying.py
index 79de835..c259f06 100644
--- a/erpnext/config/buying.py
+++ b/erpnext/config/buying.py
@@ -4,16 +4,11 @@
def get_data():
return [
{
- "label": _("Documents"),
+ "label": _("Purchasing"),
"icon": "icon-star",
"items": [
{
"type": "doctype",
- "name": "Supplier",
- "description": _("Supplier database."),
- },
- {
- "type": "doctype",
"name": "Material Request",
"description": _("Request for purchase."),
},
@@ -27,6 +22,21 @@
"name": "Purchase Order",
"description": _("Purchase Orders given to Suppliers."),
},
+ ]
+ },
+ {
+ "label": _("Supplier"),
+ "items": [
+ {
+ "type": "doctype",
+ "name": "Supplier",
+ "description": _("Supplier database."),
+ },
+ {
+ "type": "doctype",
+ "name": "Supplier Type",
+ "description": _("Supplier Type master.")
+ },
{
"type": "doctype",
"name": "Contact",
@@ -37,11 +47,7 @@
"name": "Address",
"description": _("All Addresses."),
},
- {
- "type": "doctype",
- "name": "Item",
- "description": _("All Products or Services."),
- },
+
]
},
{
@@ -55,20 +61,6 @@
},
{
"type": "doctype",
- "name": "Supplier Type",
- "description": _("Supplier Type master.")
- },
- {
- "type": "page",
- "name": "Sales Browser",
- "icon": "icon-sitemap",
- "label": _("Item Group Tree"),
- "link": "Sales Browser/Item Group",
- "description": _("Tree of Item Groups."),
- "doctype": "Item Group",
- },
- {
- "type": "doctype",
"name":"Terms and Conditions",
"label": _("Terms and Conditions Template"),
"description": _("Template of terms or contract.")
@@ -78,12 +70,36 @@
"name": "Purchase Taxes and Charges Template",
"description": _("Tax template for buying transactions.")
},
+ ]
+ },
+ {
+ "label": _("Items and Pricing"),
+ "items": [
+ {
+ "type": "doctype",
+ "name": "Item",
+ "description": _("All Products or Services."),
+ },
+ {
+ "type": "doctype",
+ "name": "Product Bundle",
+ "description": _("Bundle items at time of sale."),
+ },
{
"type": "doctype",
"name": "Price List",
"description": _("Price List master.")
},
{
+ "type": "page",
+ "name": "Sales Browser",
+ "icon": "icon-sitemap",
+ "label": _("Item Group"),
+ "link": "Sales Browser/Item Group",
+ "description": _("Tree of Item Groups."),
+ "doctype": "Item Group",
+ },
+ {
"type": "doctype",
"name": "Item Price",
"description": _("Multiple Item prices."),
@@ -94,10 +110,11 @@
"name": "Pricing Rule",
"description": _("Rules for applying pricing and discount.")
},
+
]
},
{
- "label": _("Main Reports"),
+ "label": _("Analytics"),
"icon": "icon-table",
"items": [
{
@@ -106,10 +123,22 @@
"label": _("Purchase Analytics"),
"icon": "icon-bar-chart",
},
+ {
+ "type": "report",
+ "is_query_report": True,
+ "name": "Supplier-Wise Sales Analytics",
+ "doctype": "Stock Ledger Entry"
+ },
+ {
+ "type": "report",
+ "is_query_report": True,
+ "name": "Purchase Order Trends",
+ "doctype": "Purchase Order"
+ },
]
},
{
- "label": _("Standard Reports"),
+ "label": _("Other Reports"),
"icon": "icon-list",
"items": [
{
@@ -139,21 +168,9 @@
{
"type": "report",
"is_query_report": True,
- "name": "Purchase Order Trends",
- "doctype": "Purchase Order"
- },
- {
- "type": "report",
- "is_query_report": True,
"name": "Supplier Addresses and Contacts",
"doctype": "Supplier"
},
- {
- "type": "report",
- "is_query_report": True,
- "name": "Supplier-Wise Sales Analytics",
- "doctype": "Stock Ledger Entry"
- }
]
},
{
diff --git a/erpnext/config/crm.py b/erpnext/config/crm.py
index b92bf22..26e9e03 100644
--- a/erpnext/config/crm.py
+++ b/erpnext/config/crm.py
@@ -3,7 +3,7 @@
def get_data():
return [
{
- "label": _("Documents"),
+ "label": _("Sales Pipeline"),
"icon": "icon-star",
"items": [
{
@@ -13,19 +13,55 @@
},
{
"type": "doctype",
- "name": "Customer",
- "description": _("Customer database."),
+ "name": "Opportunity",
+ "description": _("Potential opportunities for selling."),
},
{
"type": "doctype",
- "name": "Opportunity",
- "description": _("Potential opportunities for selling."),
+ "name": "Customer",
+ "description": _("Customer database."),
},
{
"type": "doctype",
"name": "Contact",
"description": _("All Contacts."),
},
+ ]
+ },
+ {
+ "label": _("Reports"),
+ "icon": "icon-list",
+ "items": [
+ {
+ "type": "page",
+ "name": "sales-funnel",
+ "label": _("Sales Funnel"),
+ "icon": "icon-bar-chart",
+ },
+ {
+ "type": "report",
+ "is_query_report": True,
+ "name": "Lead Details",
+ "doctype": "Lead"
+ },
+ {
+ "type": "report",
+ "is_query_report": True,
+ "name": "Customer Addresses and Contacts",
+ "doctype": "Contact"
+ },
+ {
+ "type": "report",
+ "is_query_report": True,
+ "name": "Inactive Customers",
+ "doctype": "Sales Order"
+ },
+ ]
+ },
+ {
+ "label": _("Communication"),
+ "icon": "icon-star",
+ "items": [
{
"type": "doctype",
"name": "Newsletter",
@@ -39,22 +75,6 @@
]
},
{
- "label": _("Tools"),
- "icon": "icon-wrench",
- "items": [
- {
- "type": "doctype",
- "name": "SMS Center",
- "description":_("Send mass SMS to your contacts"),
- },
- {
- "type": "doctype",
- "name": "SMS Log",
- "description":_("Logs for maintaining sms delivery status"),
- }
- ]
- },
- {
"label": _("Setup"),
"icon": "icon-cog",
"items": [
@@ -95,47 +115,27 @@
"name": "Newsletter List",
"description": _("Newsletter Mailing List"),
},
+ ]
+ },
+ {
+ "label": _("SMS"),
+ "icon": "icon-wrench",
+ "items": [
+ {
+ "type": "doctype",
+ "name": "SMS Center",
+ "description":_("Send mass SMS to your contacts"),
+ },
+ {
+ "type": "doctype",
+ "name": "SMS Log",
+ "description":_("Logs for maintaining sms delivery status"),
+ },
{
"type": "doctype",
"name": "SMS Settings",
"description": _("Setup SMS gateway settings")
- },
- ]
- },
- {
- "label": _("Main Reports"),
- "icon": "icon-table",
- "items": [
- {
- "type": "page",
- "name": "sales-funnel",
- "label": _("Sales Funnel"),
- "icon": "icon-bar-chart",
- },
- ]
- },
- {
- "label": _("Standard Reports"),
- "icon": "icon-list",
- "items": [
- {
- "type": "report",
- "is_query_report": True,
- "name": "Lead Details",
- "doctype": "Lead"
- },
- {
- "type": "report",
- "is_query_report": True,
- "name": "Customer Addresses and Contacts",
- "doctype": "Contact"
- },
- {
- "type": "report",
- "is_query_report": True,
- "name": "Customers Not Buying Since Long Time",
- "doctype": "Sales Order"
- },
+ }
]
},
{
diff --git a/erpnext/config/desktop.py b/erpnext/config/desktop.py
index 863ad6d..e15f2b6 100644
--- a/erpnext/config/desktop.py
+++ b/erpnext/config/desktop.py
@@ -10,6 +10,13 @@
"type": "module"
},
{
+ "module_name": "Stock",
+ "color": "#f39c12",
+ "icon": "icon-truck",
+ "icon": "octicon octicon-package",
+ "type": "module"
+ },
+ {
"module_name": "CRM",
"color": "#EF4DB6",
"icon": "octicon octicon-broadcast",
@@ -61,13 +68,6 @@
"type": "module"
},
{
- "module_name": "Stock",
- "color": "#f39c12",
- "icon": "icon-truck",
- "icon": "octicon octicon-package",
- "type": "module"
- },
- {
"module_name": "Support",
"color": "#2c3e50",
"icon": "icon-phone",
diff --git a/erpnext/config/hr.py b/erpnext/config/hr.py
index e147112..eea65b8 100644
--- a/erpnext/config/hr.py
+++ b/erpnext/config/hr.py
@@ -4,8 +4,7 @@
def get_data():
return [
{
- "label": _("Documents"),
- "icon": "icon-star",
+ "label": _("Employee and Attendance"),
"items": [
{
"type": "doctype",
@@ -14,13 +13,10 @@
},
{
"type": "doctype",
- "name": "Leave Application",
- "description": _("Applications for leave."),
- },
- {
- "type": "doctype",
- "name": "Expense Claim",
- "description": _("Claims for company expense."),
+ "name": "Employee Attendance Tool",
+ "label": _("Employee Attendance Tool"),
+ "description":_("Mark Employee Attendance in Bulk"),
+ "hide_count": True
},
{
"type": "doctype",
@@ -29,14 +25,15 @@
},
{
"type": "doctype",
- "name": "Salary Slip",
- "description": _("Monthly salary statement."),
+ "name": "Upload Attendance",
+ "description":_("Upload attendance from a .csv file"),
+ "hide_count": True
},
- {
- "type": "doctype",
- "name": "Appraisal",
- "description": _("Performance appraisal."),
- },
+ ]
+ },
+ {
+ "label": _("Recruitment"),
+ "items": [
{
"type": "doctype",
"name": "Job Applicant",
@@ -55,21 +52,50 @@
]
},
{
- "label": _("Tools"),
- "icon": "icon-wrench",
+ "label": _("Leaves and Holiday"),
"items": [
{
"type": "doctype",
- "name": "Employee Attendance Tool",
- "label": _("Employee Attendance Tool"),
- "description":_("Mark Employee Attendance in Bulk"),
+ "name": "Leave Application",
+ "description": _("Applications for leave."),
+ },
+ {
+ "type": "doctype",
+ "name":"Leave Type",
+ "description": _("Type of leaves like casual, sick etc."),
+ },
+ {
+ "type": "doctype",
+ "name": "Holiday List",
+ "description": _("Holiday master.")
+ },
+ {
+ "type": "doctype",
+ "name": "Leave Allocation",
+ "description": _("Allocate leaves for a period.")
+ },
+ {
+ "type": "doctype",
+ "name": "Leave Control Panel",
+ "label": _("Leave Allocation Tool"),
+ "description":_("Allocate leaves for the year."),
"hide_count": True
},
{
"type": "doctype",
- "name": "Upload Attendance",
- "description":_("Upload attendance from a .csv file"),
- "hide_count": True
+ "name": "Leave Block List",
+ "description": _("Block leave applications by department.")
+ },
+
+ ]
+ },
+ {
+ "label": _("Payroll"),
+ "items": [
+ {
+ "type": "doctype",
+ "name": "Salary Slip",
+ "description": _("Monthly salary statement."),
},
{
"type": "doctype",
@@ -78,14 +104,60 @@
"description":_("Generate Salary Slips"),
"hide_count": True
},
-
{
"type": "doctype",
- "name": "Leave Control Panel",
- "label": _("Leave Allocation Tool"),
- "description":_("Allocate leaves for the year."),
- "hide_count": True
+ "name": "Salary Structure",
+ "description": _("Salary template master.")
},
+ {
+ "type": "doctype",
+ "name": "Earning Type",
+ "description": _("Salary components.")
+ },
+ {
+ "type": "doctype",
+ "name": "Deduction Type",
+ "description": _("Tax and other salary deductions.")
+ },
+
+ ]
+ },
+ {
+ "label": _("Expense Claims"),
+ "items": [
+ {
+ "type": "doctype",
+ "name": "Expense Claim",
+ "description": _("Claims for company expense."),
+ },
+ {
+ "type": "doctype",
+ "name": "Expense Claim Type",
+ "description": _("Types of Expense Claim.")
+ },
+ ]
+ },
+ {
+ "label": _("Appraisals"),
+ "items": [
+ {
+ "type": "doctype",
+ "name": "Appraisal",
+ "description": _("Performance appraisal."),
+ },
+ {
+ "type": "doctype",
+ "name": "Appraisal Template",
+ "description": _("Template for performance appraisals.")
+ },
+ ]
+ },
+
+ {
+ "label": _("Tools"),
+ "icon": "icon-wrench",
+ "items": [
+
]
},
{
@@ -117,60 +189,10 @@
"name": "Designation",
"description": _("Employee designation (e.g. CEO, Director etc.).")
},
- {
- "type": "doctype",
- "name": "Salary Structure",
- "description": _("Salary template master.")
- },
- {
- "type": "doctype",
- "name": "Earning Type",
- "description": _("Salary components.")
- },
- {
- "type": "doctype",
- "name": "Deduction Type",
- "description": _("Tax and other salary deductions.")
- },
- {
- "type": "doctype",
- "name": "Leave Allocation",
- "description": _("Allocate leaves for a period.")
- },
- {
- "type": "doctype",
- "name":"Leave Type",
- "description": _("Type of leaves like casual, sick etc."),
- },
- {
- "type": "doctype",
- "name": "Holiday List",
- "description": _("Holiday master.")
- },
- {
- "type": "doctype",
- "name": "Leave Block List",
- "description": _("Block leave applications by department.")
- },
- {
- "type": "doctype",
- "name": "Appraisal Template",
- "description": _("Template for performance appraisals.")
- },
- {
- "type": "doctype",
- "name": "Expense Claim Type",
- "description": _("Types of Expense Claim.")
- },
- {
- "type": "doctype",
- "name": "Email Account",
- "description": _("Setup incoming server for jobs email id. (e.g. jobs@example.com)")
- },
]
},
{
- "label": _("Standard Reports"),
+ "label": _("Reports"),
"icon": "icon-list",
"items": [
{
diff --git a/erpnext/config/manufacturing.py b/erpnext/config/manufacturing.py
index 1db7945..2ae49fe 100644
--- a/erpnext/config/manufacturing.py
+++ b/erpnext/config/manufacturing.py
@@ -4,25 +4,48 @@
def get_data():
return [
{
- "label": _("Documents"),
+ "label": _("Production"),
"icon": "icon-star",
"items": [
{
"type": "doctype",
- "name": "BOM",
- "description": _("Bill of Materials (BOM)"),
- "label": _("Bill of Material")
- },
- {
- "type": "doctype",
"name": "Production Order",
"description": _("Orders released for production."),
},
{
"type": "doctype",
+ "name": "Production Planning Tool",
+ "description": _("Generate Material Requests (MRP) and Production Orders."),
+ },
+ {
+ "type": "doctype",
+ "name": "Stock Entry",
+ },
+ {
+ "type": "doctype",
"name": "Time Log",
"description": _("Time Logs for manufacturing."),
},
+
+ ]
+ },
+ {
+ "label": _("Bill of Materials"),
+ "items": [
+ {
+ "type": "doctype",
+ "name": "BOM",
+ "description": _("Bill of Materials (BOM)"),
+ "label": _("Bill of Materials")
+ },
+ {
+ "type": "page",
+ "name": "bom-browser",
+ "icon": "icon-sitemap",
+ "label": _("BOM Browser"),
+ "description": _("Tree of Bill of Materials"),
+ "doctype": "BOM"
+ },
{
"type": "doctype",
"name": "Item",
@@ -47,22 +70,9 @@
"items": [
{
"type": "doctype",
- "name": "Production Planning Tool",
- "description": _("Generate Material Requests (MRP) and Production Orders."),
- },
- {
- "type": "doctype",
"name": "BOM Replace Tool",
"description": _("Replace Item / BOM in all BOMs"),
},
- {
- "type": "page",
- "name": "bom-browser",
- "icon": "icon-sitemap",
- "label": _("BOM Browser"),
- "description": _("Tree of Bill of Materials"),
- "doctype": "BOM"
- }
]
},
{
@@ -76,7 +86,7 @@
]
},
{
- "label": _("Standard Reports"),
+ "label": _("Reports"),
"icon": "icon-list",
"items": [
{
diff --git a/erpnext/config/projects.py b/erpnext/config/projects.py
index 78a78ac..3deaeba 100644
--- a/erpnext/config/projects.py
+++ b/erpnext/config/projects.py
@@ -4,19 +4,31 @@
def get_data():
return [
{
- "label": _("Documents"),
+ "label": _("Projects"),
"icon": "icon-star",
"items": [
{
"type": "doctype",
+ "name": "Project",
+ "description": _("Project master."),
+ },
+ {
+ "type": "doctype",
"name": "Task",
"description": _("Project activity / task."),
},
{
- "type": "doctype",
- "name": "Project",
- "description": _("Project master."),
+ "type": "report",
+ "route": "Gantt/Task",
+ "doctype": "Task",
+ "name": "Gantt Chart",
+ "description": _("Gantt chart of all tasks.")
},
+ ]
+ },
+ {
+ "label": _("Time Tracking"),
+ "items": [
{
"type": "doctype",
"name": "Time Log",
@@ -40,20 +52,7 @@
]
},
{
- "label": _("Tools"),
- "icon": "icon-wrench",
- "items": [
- {
- "type": "report",
- "route": "Gantt/Task",
- "doctype": "Task",
- "name": "Gantt Chart",
- "description": _("Gantt chart of all tasks.")
- },
- ]
- },
- {
- "label": _("Standard Reports"),
+ "label": _("Reports"),
"icon": "icon-list",
"items": [
{
diff --git a/erpnext/config/selling.py b/erpnext/config/selling.py
index ba1210e..771a0d7 100644
--- a/erpnext/config/selling.py
+++ b/erpnext/config/selling.py
@@ -4,16 +4,11 @@
def get_data():
return [
{
- "label": _("Documents"),
+ "label": _("Sales"),
"icon": "icon-star",
"items": [
{
"type": "doctype",
- "name": "Customer",
- "description": _("Customer database."),
- },
- {
- "type": "doctype",
"name": "Quotation",
"description": _("Quotes to Leads or Customers."),
},
@@ -22,6 +17,25 @@
"name": "Sales Order",
"description": _("Confirmed orders from Customers."),
},
+ ]
+ },
+ {
+ "label": _("Customers"),
+ "items": [
+ {
+ "type": "doctype",
+ "name": "Customer",
+ "description": _("Customer database."),
+ },
+ {
+ "type": "page",
+ "label": _("Customer Group"),
+ "name": "Sales Browser",
+ "icon": "icon-sitemap",
+ "link": "Sales Browser/Customer Group",
+ "description": _("Manage Customer Group Tree."),
+ "doctype": "Customer Group",
+ },
{
"type": "doctype",
"name": "Contact",
@@ -32,58 +46,59 @@
"name": "Address",
"description": _("All Addresses."),
},
+
+ ]
+ },
+ {
+ "label": _("Items and Pricing"),
+ "items": [
{
"type": "doctype",
"name": "Item",
"description": _("All Products or Services."),
},
- ]
- },
- {
- "label": _("Tools"),
- "icon": "icon-wrench",
- "items": [
{
"type": "doctype",
- "name": "SMS Center",
- "description":_("Send mass SMS to your contacts"),
+ "name": "Product Bundle",
+ "description": _("Bundle items at time of sale."),
},
{
"type": "doctype",
- "name": "SMS Log",
- "description":_("Logs for maintaining sms delivery status"),
- },
- {
- "type": "doctype",
- "name": "Newsletter",
- "description": _("Newsletters to contacts, leads."),
- },
- ]
- },
- {
- "label": _("Setup"),
- "icon": "icon-cog",
- "items": [
- {
- "type": "doctype",
- "name": "Selling Settings",
- "description": _("Default settings for selling transactions.")
- },
- {
- "type": "doctype",
- "name": "Campaign",
- "description": _("Sales campaigns."),
+ "name": "Price List",
+ "description": _("Price List master.")
},
{
"type": "page",
- "label": _("Customer Group"),
"name": "Sales Browser",
"icon": "icon-sitemap",
- "link": "Sales Browser/Customer Group",
- "description": _("Manage Customer Group Tree."),
- "doctype": "Customer Group",
+ "label": _("Item Group"),
+ "link": "Sales Browser/Item Group",
+ "description": _("Tree of Item Groups."),
+ "doctype": "Item Group",
},
{
+ "type": "doctype",
+ "name": "Item Price",
+ "description": _("Multiple Item prices."),
+ "route": "Report/Item Price"
+ },
+ {
+ "type": "doctype",
+ "name": "Shipping Rule",
+ "description": _("Rules for adding shipping costs.")
+ },
+ {
+ "type": "doctype",
+ "name": "Pricing Rule",
+ "description": _("Rules for applying pricing and discount.")
+ },
+
+ ]
+ },
+ {
+ "label": _("Sales Partners and Territory"),
+ "items": [
+ {
"type": "page",
"label": _("Territory"),
"name": "Sales Browser",
@@ -107,13 +122,34 @@
"doctype": "Sales Person",
},
{
- "type": "page",
- "name": "Sales Browser",
- "icon": "icon-sitemap",
- "label": _("Item Group Tree"),
- "link": "Sales Browser/Item Group",
- "description": _("Tree of Item Groups."),
- "doctype": "Item Group",
+ "type": "report",
+ "is_query_report": True,
+ "name": "Territory Target Variance (Item Group-Wise)",
+ "route": "query-report/Territory Target Variance Item Group-Wise",
+ "doctype": "Territory"
+ },
+ {
+ "type": "report",
+ "is_query_report": True,
+ "name": "Sales Person Target Variance (Item Group-Wise)",
+ "route": "query-report/Sales Person Target Variance Item Group-Wise",
+ "doctype": "Sales Person",
+ },
+ ]
+ },
+ {
+ "label": _("Setup"),
+ "icon": "icon-cog",
+ "items": [
+ {
+ "type": "doctype",
+ "name": "Selling Settings",
+ "description": _("Default settings for selling transactions.")
+ },
+ {
+ "type": "doctype",
+ "name": "Campaign",
+ "description": _("Sales campaigns."),
},
{
"type": "doctype",
@@ -128,49 +164,13 @@
},
{
"type": "doctype",
- "name": "Shipping Rule",
- "description": _("Rules for adding shipping costs.")
- },
- {
- "type": "doctype",
- "name": "Price List",
- "description": _("Price List master.")
- },
- {
- "type": "doctype",
- "name": "Item Price",
- "description": _("Multiple Item prices."),
- "route": "Report/Item Price"
- },
- {
- "type": "doctype",
- "name": "Pricing Rule",
- "description": _("Rules for applying pricing and discount.")
- },
- {
- "type": "doctype",
- "name": "Product Bundle",
- "description": _("Bundle items at time of sale."),
- },
- {
- "type": "doctype",
- "name": "Email Account",
- "description": _("Setup incoming server for sales email id. (e.g. sales@example.com)")
- },
- {
- "type": "doctype",
"name": "Industry Type",
"description": _("Track Leads by Industry Type.")
},
- {
- "type": "doctype",
- "name": "SMS Settings",
- "description": _("Setup SMS gateway settings")
- },
]
},
{
- "label": _("Main Reports"),
+ "label": _("Analytics"),
"icon": "icon-table",
"items": [
{
@@ -192,10 +192,22 @@
"doctype": "Customer",
"icon": "icon-bar-chart",
},
+ {
+ "type": "report",
+ "is_query_report": True,
+ "name": "Quotation Trends",
+ "doctype": "Quotation"
+ },
+ {
+ "type": "report",
+ "is_query_report": True,
+ "name": "Sales Order Trends",
+ "doctype": "Sales Order"
+ },
]
},
{
- "label": _("Standard Reports"),
+ "label": _("Other Reports"),
"icon": "icon-list",
"items": [
{
@@ -231,39 +243,13 @@
{
"type": "report",
"is_query_report": True,
- "name": "Territory Target Variance (Item Group-Wise)",
- "route": "query-report/Territory Target Variance Item Group-Wise",
- "doctype": "Territory"
- },
- {
- "type": "report",
- "is_query_report": True,
- "name": "Sales Person Target Variance (Item Group-Wise)",
- "route": "query-report/Sales Person Target Variance Item Group-Wise",
- "doctype": "Sales Person",
- },
- {
- "type": "report",
- "is_query_report": True,
"name": "BOM Search",
"doctype": "BOM"
},
{
"type": "report",
"is_query_report": True,
- "name": "Customers Not Buying Since Long Time",
- "doctype": "Sales Order"
- },
- {
- "type": "report",
- "is_query_report": True,
- "name": "Quotation Trends",
- "doctype": "Quotation"
- },
- {
- "type": "report",
- "is_query_report": True,
- "name": "Sales Order Trends",
+ "name": "Inactive Customers",
"doctype": "Sales Order"
},
{
@@ -287,6 +273,27 @@
]
},
{
+ "label": _("SMS"),
+ "icon": "icon-wrench",
+ "items": [
+ {
+ "type": "doctype",
+ "name": "SMS Center",
+ "description":_("Send mass SMS to your contacts"),
+ },
+ {
+ "type": "doctype",
+ "name": "SMS Log",
+ "description":_("Logs for maintaining sms delivery status"),
+ },
+ {
+ "type": "doctype",
+ "name": "SMS Settings",
+ "description": _("Setup SMS gateway settings")
+ },
+ ]
+ },
+ {
"label": _("Help"),
"items": [
{
diff --git a/erpnext/config/stock.py b/erpnext/config/stock.py
index 9b47e58..cf3a7ba 100644
--- a/erpnext/config/stock.py
+++ b/erpnext/config/stock.py
@@ -4,21 +4,10 @@
def get_data():
return [
{
- "label": _("Documents"),
- "icon": "icon-star",
+ "label": _("Stock Transactions"),
"items": [
{
"type": "doctype",
- "name": "Item",
- "description": _("All Products or Services."),
- },
- {
- "type": "doctype",
- "name": "Material Request",
- "description": _("Requests for items."),
- },
- {
- "type": "doctype",
"name": "Stock Entry",
"description": _("Record item movement."),
},
@@ -34,16 +23,92 @@
},
{
"type": "doctype",
- "name": "Installation Note",
- "description": _("Installation record for a Serial No.")
+ "name": "Material Request",
+ "description": _("Requests for items."),
+ },
+ ]
+ },
+ {
+ "label": _("Stock Reports"),
+ "items": [
+ {
+ "type": "report",
+ "is_query_report": True,
+ "name": "Stock Ledger",
+ "doctype": "Stock Ledger Entry",
+ },
+ {
+ "type": "report",
+ "is_query_report": True,
+ "name": "Stock Balance",
+ "doctype": "Stock Ledger Entry"
+ },
+ {
+ "type": "report",
+ "is_query_report": True,
+ "name": "Stock Projected Qty",
+ "doctype": "Item",
+ },
+ {
+ "type": "report",
+ "is_query_report": True,
+ "name": "Stock Ageing",
+ "doctype": "Item",
+ },
+
+ ]
+ },
+ {
+ "label": _("Items and Pricing"),
+ "items": [
+ {
+ "type": "doctype",
+ "name": "Item",
+ "description": _("All Products or Services."),
},
{
"type": "doctype",
- "name": "Warehouse",
- "description": _("Where items are stored."),
+ "name": "Product Bundle",
+ "description": _("Bundle items at time of sale."),
},
{
"type": "doctype",
+ "name": "Price List",
+ "description": _("Price List master.")
+ },
+ {
+ "type": "page",
+ "name": "Sales Browser",
+ "icon": "icon-sitemap",
+ "label": _("Item Group"),
+ "link": "Sales Browser/Item Group",
+ "description": _("Tree of Item Groups."),
+ "doctype": "Item Group",
+ },
+ {
+ "type": "doctype",
+ "name": "Item Price",
+ "description": _("Multiple Item prices."),
+ "route": "Report/Item Price"
+ },
+ {
+ "type": "doctype",
+ "name": "Shipping Rule",
+ "description": _("Rules for adding shipping costs.")
+ },
+ {
+ "type": "doctype",
+ "name": "Pricing Rule",
+ "description": _("Rules for applying pricing and discount.")
+ },
+
+ ]
+ },
+ {
+ "label": _("Serial No and Batch"),
+ "items": [
+ {
+ "type": "doctype",
"name": "Serial No",
"description": _("Single unit of an Item."),
},
@@ -52,6 +117,26 @@
"name": "Batch",
"description": _("Batch (lot) of an Item."),
},
+ {
+ "type": "doctype",
+ "name": "Installation Note",
+ "description": _("Installation record for a Serial No.")
+ },
+ {
+ "type": "report",
+ "name": "Serial No Service Contract Expiry",
+ "doctype": "Serial No"
+ },
+ {
+ "type": "report",
+ "name": "Serial No Status",
+ "doctype": "Serial No"
+ },
+ {
+ "type": "report",
+ "name": "Serial No Warranty Expiry",
+ "doctype": "Serial No"
+ },
]
},
{
@@ -90,13 +175,9 @@
"description": _("Default settings for stock transactions.")
},
{
- "type": "page",
- "name": "Sales Browser",
- "icon": "icon-sitemap",
- "label": _("Item Group Tree"),
- "link": "Sales Browser/Item Group",
- "description": _("Tree of Item Groups."),
- "doctype": "Item Group",
+ "type": "doctype",
+ "name": "Warehouse",
+ "description": _("Where items are stored."),
},
{
"type": "doctype",
@@ -106,62 +187,22 @@
},
{
"type": "doctype",
- "name": "Warehouse",
- "description": _("Warehouses.")
+ "name": "Item Attribute",
+ "description": _("Attributes for Item Variants. e.g Size, Color etc."),
},
{
"type": "doctype",
"name": "Brand",
"description": _("Brand master.")
},
- {
- "type": "doctype",
- "name": "Price List",
- "description": _("Price List master.")
- },
- {
- "type": "doctype",
- "name": "Item Price",
- "description": _("Multiple Item prices."),
- "route": "Report/Item Price"
- },
- {
- "type": "doctype",
- "name": "Item Attribute",
- "description": _("Attributes for Item Variants. e.g Size, Color etc."),
- },
]
},
{
- "label": _("Main Reports"),
+ "label": _("Analytics"),
"icon": "icon-table",
"items": [
{
"type": "report",
- "is_query_report": True,
- "name": "Stock Ledger",
- "doctype": "Stock Ledger Entry",
- },
- {
- "type": "report",
- "is_query_report": True,
- "name": "Stock Balance",
- "doctype": "Stock Ledger Entry"
- },
- {
- "type": "report",
- "is_query_report": True,
- "name": "Stock Projected Qty",
- "doctype": "Item",
- },
- {
- "type": "report",
- "is_query_report": True,
- "name": "Stock Ageing",
- "doctype": "Item",
- },
- {
- "type": "report",
"is_query_report": False,
"name": "Item-wise Price List Rate",
"doctype": "Item Price",
@@ -171,11 +212,24 @@
"name": "stock-analytics",
"label": _("Stock Analytics"),
"icon": "icon-bar-chart"
- }
+ },
+ {
+ "type": "report",
+ "is_query_report": True,
+ "name": "Delivery Note Trends",
+ "doctype": "Delivery Note"
+ },
+ {
+ "type": "report",
+ "is_query_report": True,
+ "name": "Purchase Receipt Trends",
+ "doctype": "Purchase Receipt"
+ },
+
]
},
{
- "label": _("Standard Reports"),
+ "label": _("Reports"),
"icon": "icon-list",
"items": [
{
@@ -198,21 +252,6 @@
},
{
"type": "report",
- "name": "Serial No Service Contract Expiry",
- "doctype": "Serial No"
- },
- {
- "type": "report",
- "name": "Serial No Status",
- "doctype": "Serial No"
- },
- {
- "type": "report",
- "name": "Serial No Warranty Expiry",
- "doctype": "Serial No"
- },
- {
- "type": "report",
"is_query_report": True,
"name": "Requested Items To Be Transferred",
"doctype": "Material Request"
@@ -235,18 +274,6 @@
"name": "Itemwise Recommended Reorder Level",
"doctype": "Item"
},
- {
- "type": "report",
- "is_query_report": True,
- "name": "Delivery Note Trends",
- "doctype": "Delivery Note"
- },
- {
- "type": "report",
- "is_query_report": True,
- "name": "Purchase Receipt Trends",
- "doctype": "Purchase Receipt"
- },
]
},
{
diff --git a/erpnext/config/support.py b/erpnext/config/support.py
index a3b6917..ca97164 100644
--- a/erpnext/config/support.py
+++ b/erpnext/config/support.py
@@ -4,8 +4,7 @@
def get_data():
return [
{
- "label": _("Documents"),
- "icon": "icon-star",
+ "label": _("Issues"),
"items": [
{
"type": "doctype",
@@ -14,9 +13,14 @@
},
{
"type": "doctype",
- "name": "Warranty Claim",
- "description": _("Warranty Claim against Serial No."),
+ "name": "Communication",
+ "description": _("Communication log."),
},
+ ]
+ },
+ {
+ "label": _("Maintenance"),
+ "items": [
{
"type": "doctype",
"name": "Maintenance Schedule",
@@ -28,14 +32,20 @@
"description": _("Visit report for maintenance call."),
},
{
- "type": "doctype",
- "name": "Newsletter",
- "description": _("Newsletters to contacts, leads."),
+ "type": "report",
+ "name": "Maintenance Schedules",
+ "is_query_report": True,
+ "doctype": "Maintenance Schedule"
},
+ ]
+ },
+ {
+ "label": _("Warranty"),
+ "items": [
{
"type": "doctype",
- "name": "Communication",
- "description": _("Communication log."),
+ "name": "Warranty Claim",
+ "description": _("Warranty Claim against Serial No."),
},
{
"type": "doctype",
@@ -45,18 +55,7 @@
]
},
{
- "label": _("Setup"),
- "icon": "icon-cog",
- "items": [
- {
- "type": "doctype",
- "name": "Email Account",
- "description": _("Setup incoming server for support email id. (e.g. support@example.com)")
- },
- ]
- },
- {
- "label": _("Standard Reports"),
+ "label": _("Reports"),
"icon": "icon-list",
"items": [
{
@@ -65,12 +64,6 @@
"label": _("Support Analytics"),
"icon": "icon-bar-chart"
},
- {
- "type": "report",
- "name": "Maintenance Schedules",
- "is_query_report": True,
- "doctype": "Maintenance Schedule"
- },
]
},
]
diff --git a/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.json b/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.json
deleted file mode 100644
index fe53574..0000000
--- a/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "apply_user_permissions": 1,
- "creation": "2013-06-07 12:27:07",
- "docstatus": 0,
- "doctype": "Report",
- "idx": 1,
- "is_standard": "Yes",
- "modified": "2014-06-03 07:18:17.013590",
- "modified_by": "Administrator",
- "module": "Selling",
- "name": "Customers Not Buying Since Long Time",
- "owner": "Administrator",
- "ref_doctype": "Sales Order",
- "report_name": "Customers Not Buying Since Long Time ",
- "report_type": "Script Report"
-}
\ No newline at end of file
diff --git a/erpnext/selling/report/customers_not_buying_since_long_time/__init__.py b/erpnext/selling/report/inactive_customers/__init__.py
similarity index 100%
rename from erpnext/selling/report/customers_not_buying_since_long_time/__init__.py
rename to erpnext/selling/report/inactive_customers/__init__.py
diff --git a/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js b/erpnext/selling/report/inactive_customers/inactive_customers.js
similarity index 62%
rename from erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js
rename to erpnext/selling/report/inactive_customers/inactive_customers.js
index 6d00b82..804d17e 100644
--- a/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js
+++ b/erpnext/selling/report/inactive_customers/inactive_customers.js
@@ -1,7 +1,7 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
-frappe.query_reports["Customers Not Buying Since Long Time"] = {
+frappe.query_reports["Inactive Customers"] = {
"filters": [
{
"fieldname":"days_since_last_order",
@@ -17,4 +17,4 @@
"options": "Sales Order\nSales Invoice"
}
]
-}
\ No newline at end of file
+}
diff --git a/erpnext/selling/report/inactive_customers/inactive_customers.json b/erpnext/selling/report/inactive_customers/inactive_customers.json
new file mode 100644
index 0000000..cfbeb90
--- /dev/null
+++ b/erpnext/selling/report/inactive_customers/inactive_customers.json
@@ -0,0 +1,18 @@
+{
+ "add_total_row": 0,
+ "apply_user_permissions": 1,
+ "creation": "2016-03-08 04:05:02.846556",
+ "disabled": 0,
+ "docstatus": 0,
+ "doctype": "Report",
+ "idx": 0,
+ "is_standard": "Yes",
+ "modified": "2016-03-08 04:05:02.846556",
+ "modified_by": "Administrator",
+ "module": "Selling",
+ "name": "Inactive Customers",
+ "owner": "Administrator",
+ "ref_doctype": "Sales Order",
+ "report_name": "Inactive Customers",
+ "report_type": "Script Report"
+}
\ No newline at end of file
diff --git a/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py b/erpnext/selling/report/inactive_customers/inactive_customers.py
similarity index 93%
rename from erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py
rename to erpnext/selling/report/inactive_customers/inactive_customers.py
index 86186aa..e7aff36 100644
--- a/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py
+++ b/erpnext/selling/report/inactive_customers/inactive_customers.py
@@ -1,5 +1,5 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
+# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
from __future__ import unicode_literals
import frappe
@@ -11,7 +11,7 @@
days_since_last_order = filters.get("days_since_last_order")
doctype = filters.get("doctype")
-
+
if cint(days_since_last_order) <= 0:
frappe.throw(_("'Days Since Last Order' must be greater than or equal to zero"))
@@ -35,7 +35,7 @@
so.base_net_total)) as 'total_order_considered',
max(so.transaction_date) as 'last_order_date',
DATEDIFF(CURDATE(), max(so.transaction_date)) as 'days_since_last_order'"""
-
+
return frappe.db.sql("""select
cust.name,
cust.customer_name,