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

[breadcrumbs] refactor

Browse Source
This commit is contained in:
Rushabh Mehta 2015-03-09 15:47:15 +05:30
parent ecd2e0f386
commit f5f0d5a83a
16 changed files with 40 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/page/accounts_browser/accounts_browser.js
View File

@ -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 = $("<div>")

2
erpnext/accounts/page/financial_analytics/financial_analytics.js
View File

@ -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");
};

2
erpnext/buying/page/purchase_analytics/purchase_analytics.js
View File

@ -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({

9
erpnext/change_log/v5/v5_0_0.md Normal file
View File

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

25
erpnext/public/js/conf.js
View File

@ -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"
});

2
erpnext/selling/page/sales_analytics/sales_analytics.js
View File

@ -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")
};

2
erpnext/selling/page/sales_browser/sales_browser.js
View File

@ -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();

2
erpnext/selling/page/sales_funnel/sales_funnel.js
View File

@ -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({

2
erpnext/stock/page/stock_analytics/stock_analytics.js
View File

@ -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")
};

2
erpnext/stock/page/stock_ledger/stock_ledger.js
View File

@ -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");

2
erpnext/stock/page/stock_level/stock_level.js
View File

@ -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")
;
}

2
erpnext/support/page/support_analytics/support_analytics.js
View File

@ -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")
}

2
erpnext/templates/generators/item.html
View File

@ -74,5 +74,3 @@
});
</script>
{% endblock %}
{% block sidebar %}{% include "templates/includes/sidebar.html" %}{% endblock %}

6
erpnext/templates/generators/sales_partner.html
View File

@ -7,12 +7,12 @@
<div class="row">
<div class="col-md-4">
{% if logo -%}
<img itemprop="brand" src="{{ logo }}" class="partner-logo"
<img itemprop="brand" src="{{ logo }}" class="partner-logo"
alt="{{ partner_name }}" title="{{ partner_name }}" />
<br><br>
{%- endif %}
<address>
{% if partner_website -%}<p><a href="{{ partner_website }}"
{% if partner_website -%}<p><a href="{{ partner_website }}"
target="_blank">{{ partner_website }}</a></p>{%- endif %}
{% if partner_address -%}<p itemprop="address">{{ partner_address }}</p>{%- endif %}
{% if phone -%}<p itemprop="telephone">{{ phone }}</p>{%- endif %}
@ -25,5 +25,3 @@
</div>
</div>
{% endblock %}
{% block sidebar %}{% include "templates/includes/sidebar.html" %}{% endblock %}

2
erpnext/templates/pages/partners.html
View File

@ -26,5 +26,3 @@
{% endfor %}
</div>
{% endblock %}
{% block sidebar %}{% include "templates/includes/sidebar.html" %}{% endblock %}

2
erpnext/templates/pages/product_search.html
View File

@ -29,5 +29,3 @@ $(document).ready(function() {
</div>
</div>
{% endblock %}
{% block sidebar %}{% include "templates/includes/sidebar.html" %}{% endblock %}