diff --git a/erpnext/accounts/page/accounts_browser/accounts_browser.js b/erpnext/accounts/page/accounts_browser/accounts_browser.js index 1b3482d00c2..59258eadab5 100644 --- a/erpnext/accounts/page/accounts_browser/accounts_browser.js +++ b/erpnext/accounts/page/accounts_browser/accounts_browser.js @@ -13,7 +13,7 @@ frappe.pages["Accounts Browser"].on_page_load = function(wrapper){ single_column: true }) - frappe.add_breadcrumbs("Accounts"); + frappe.breadcrumbs.add("Accounts"); var main = wrapper.page.main, chart_area = $("
") diff --git a/erpnext/accounts/page/financial_analytics/financial_analytics.js b/erpnext/accounts/page/financial_analytics/financial_analytics.js index 7df306b824a..a9ac72fe8fb 100644 --- a/erpnext/accounts/page/financial_analytics/financial_analytics.js +++ b/erpnext/accounts/page/financial_analytics/financial_analytics.js @@ -8,7 +8,7 @@ frappe.pages['financial-analytics'].on_page_load = function(wrapper) { single_column: true }); erpnext.financial_analytics = new erpnext.FinancialAnalytics(wrapper, 'Financial Analytics'); - frappe.add_breadcrumbs("Accounts"); + frappe.breadcrumbs.add("Accounts"); }; diff --git a/erpnext/buying/page/purchase_analytics/purchase_analytics.js b/erpnext/buying/page/purchase_analytics/purchase_analytics.js index c775b133658..afb615fc2e1 100644 --- a/erpnext/buying/page/purchase_analytics/purchase_analytics.js +++ b/erpnext/buying/page/purchase_analytics/purchase_analytics.js @@ -11,7 +11,7 @@ frappe.pages['purchase-analytics'].on_page_load = function(wrapper) { new erpnext.PurchaseAnalytics(wrapper); - frappe.add_breadcrumbs("Buying"); + frappe.breadcrumbs.add("Buying"); } erpnext.PurchaseAnalytics = frappe.views.TreeGridReport.extend({ diff --git a/erpnext/change_log/v5/v5_0_0.md b/erpnext/change_log/v5/v5_0_0.md new file mode 100644 index 00000000000..3b096354576 --- /dev/null +++ b/erpnext/change_log/v5/v5_0_0.md @@ -0,0 +1,9 @@ +### Version 5 + +Please see https://erpnext.com/version-5 + +Changes include: + +1. New Visual Design +1. Account balance in multiple currencies +1. Hundreds of usability fixes diff --git a/erpnext/public/js/conf.js b/erpnext/public/js/conf.js index c1e68ecf9b7..d198ead92be 100644 --- a/erpnext/public/js/conf.js +++ b/erpnext/public/js/conf.js @@ -13,9 +13,22 @@ $(document).bind('toolbar_setup', function() { }); // doctypes created via tree -frappe.create_routes["Customer Group"] = "Sales Browser/Customer Group"; -frappe.create_routes["Territory"] = "Sales Browser/Territory"; -frappe.create_routes["Item Group"] = "Sales Browser/Item Group"; -frappe.create_routes["Sales Person"] = "Sales Browser/Sales Person"; -frappe.create_routes["Account"] = "Accounts Browser/Account"; -frappe.create_routes["Cost Center"] = "Accounts Browser/Cost Center"; +$.extend(frappe.create_routes, { + "Customer Group": "Sales Browser/Customer Group", + "Territory": "Sales Browser/Territory", + "Item Group": "Sales Browser/Item Group", + "Sales Person": "Sales Browser/Sales Person", + "Account": "Accounts Browser/Account", + "Cost Center": "Accounts Browser/Cost Center" +}); + +// preferred modules for breadcrumbs +$.extend(frappe.breadcrumbs.preferred, { + "Item Group": "Stock", + "Customer Group": "Selling", + "Supplier Type": "Buying", + "Territory": "Selling", + "Sales Person": "Selling", + "Sales Partner": "Selling", + "Brand": "Selling" +}); diff --git a/erpnext/selling/page/sales_analytics/sales_analytics.js b/erpnext/selling/page/sales_analytics/sales_analytics.js index a93a82abc10..e1fa2c83382 100644 --- a/erpnext/selling/page/sales_analytics/sales_analytics.js +++ b/erpnext/selling/page/sales_analytics/sales_analytics.js @@ -10,7 +10,7 @@ frappe.pages['sales-analytics'].on_page_load = function(wrapper) { new erpnext.SalesAnalytics(wrapper); - frappe.add_breadcrumbs("Selling") + frappe.breadcrumbs.add("Selling") }; diff --git a/erpnext/selling/page/sales_browser/sales_browser.js b/erpnext/selling/page/sales_browser/sales_browser.js index f184cd9f4ef..00766ade917 100644 --- a/erpnext/selling/page/sales_browser/sales_browser.js +++ b/erpnext/selling/page/sales_browser/sales_browser.js @@ -7,7 +7,7 @@ frappe.pages["Sales Browser"].on_page_load = function(wrapper){ single_column: true, }); - frappe.add_breadcrumbs("Selling") + frappe.breadcrumbs.add("Selling") wrapper.page.set_secondary_action(__('Refresh'), function() { wrapper.make_tree(); diff --git a/erpnext/selling/page/sales_funnel/sales_funnel.js b/erpnext/selling/page/sales_funnel/sales_funnel.js index 3ea8a1990d7..b3a97967ded 100644 --- a/erpnext/selling/page/sales_funnel/sales_funnel.js +++ b/erpnext/selling/page/sales_funnel/sales_funnel.js @@ -10,7 +10,7 @@ frappe.pages['sales-funnel'].on_page_load = function(wrapper) { wrapper.sales_funnel = new erpnext.SalesFunnel(wrapper); - frappe.add_breadcrumbs("Selling"); + frappe.breadcrumbs.add("Selling"); } erpnext.SalesFunnel = Class.extend({ diff --git a/erpnext/stock/page/stock_analytics/stock_analytics.js b/erpnext/stock/page/stock_analytics/stock_analytics.js index 37727f7e7c1..bd2d9f6748b 100644 --- a/erpnext/stock/page/stock_analytics/stock_analytics.js +++ b/erpnext/stock/page/stock_analytics/stock_analytics.js @@ -12,7 +12,7 @@ frappe.pages['stock-analytics'].on_page_load = function(wrapper) { new erpnext.StockAnalytics(wrapper); - frappe.add_breadcrumbs("Stock") + frappe.breadcrumbs.add("Stock") }; diff --git a/erpnext/stock/page/stock_ledger/stock_ledger.js b/erpnext/stock/page/stock_ledger/stock_ledger.js index e2c781f2bf6..befd8899078 100644 --- a/erpnext/stock/page/stock_ledger/stock_ledger.js +++ b/erpnext/stock/page/stock_ledger/stock_ledger.js @@ -9,7 +9,7 @@ frappe.pages['stock-ledger'].on_page_load = function(wrapper) { }); new erpnext.StockLedger(wrapper); - frappe.add_breadcrumbs("Stock") + frappe.breadcrumbs.add("Stock") }; frappe.require("assets/erpnext/js/stock_grid_report.js"); diff --git a/erpnext/stock/page/stock_level/stock_level.js b/erpnext/stock/page/stock_level/stock_level.js index 8ed2fe39206..92ec6c43888 100644 --- a/erpnext/stock/page/stock_level/stock_level.js +++ b/erpnext/stock/page/stock_level/stock_level.js @@ -11,7 +11,7 @@ frappe.pages['stock-level'].on_page_load = function(wrapper) { new erpnext.StockLevel(wrapper); - frappe.add_breadcrumbs("Stock") + frappe.breadcrumbs.add("Stock") ; } diff --git a/erpnext/support/page/support_analytics/support_analytics.js b/erpnext/support/page/support_analytics/support_analytics.js index 33add2853d2..4a3376c9b16 100644 --- a/erpnext/support/page/support_analytics/support_analytics.js +++ b/erpnext/support/page/support_analytics/support_analytics.js @@ -11,7 +11,7 @@ frappe.pages['support-analytics'].on_page_load = function(wrapper) { new erpnext.SupportAnalytics(wrapper); - frappe.add_breadcrumbs("Support") + frappe.breadcrumbs.add("Support") } diff --git a/erpnext/templates/generators/item.html b/erpnext/templates/generators/item.html index b6e1203c762..aa02376bce1 100644 --- a/erpnext/templates/generators/item.html +++ b/erpnext/templates/generators/item.html @@ -74,5 +74,3 @@ }); {% endblock %} - -{% block sidebar %}{% include "templates/includes/sidebar.html" %}{% endblock %} diff --git a/erpnext/templates/generators/sales_partner.html b/erpnext/templates/generators/sales_partner.html index 6a869a12074..2a07448fff0 100644 --- a/erpnext/templates/generators/sales_partner.html +++ b/erpnext/templates/generators/sales_partner.html @@ -7,12 +7,12 @@
{% if logo -%} -

{%- endif %}
- {% if partner_website -%}

{{ partner_website }}

{%- endif %} {% if partner_address -%}

{{ partner_address }}

{%- endif %} {% if phone -%}

{{ phone }}

{%- endif %} @@ -25,5 +25,3 @@
{% endblock %} - -{% block sidebar %}{% include "templates/includes/sidebar.html" %}{% endblock %} \ No newline at end of file diff --git a/erpnext/templates/pages/partners.html b/erpnext/templates/pages/partners.html index 181c6b39dd3..9c87f442d1b 100644 --- a/erpnext/templates/pages/partners.html +++ b/erpnext/templates/pages/partners.html @@ -26,5 +26,3 @@ {% endfor %}
{% endblock %} - -{% block sidebar %}{% include "templates/includes/sidebar.html" %}{% endblock %} diff --git a/erpnext/templates/pages/product_search.html b/erpnext/templates/pages/product_search.html index 8c0a8e4737b..9b51c181aaf 100644 --- a/erpnext/templates/pages/product_search.html +++ b/erpnext/templates/pages/product_search.html @@ -29,5 +29,3 @@ $(document).ready(function() { {% endblock %} - -{% block sidebar %}{% include "templates/includes/sidebar.html" %}{% endblock %}