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

Merge pull request #5626 from saurabh6790/stock_analytics

Browse Source 
[fix] load dependancies on page load event
This commit is contained in:
Rushabh Mehta 2016-07-02 17:35:50 +05:30 committed by GitHub
commit 3d047c0be5
2 changed files with 208 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/public/js/stock_analytics.js
View File

@ -1,7 +1,7 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt // License: GNU General Public License v3. See license.txt
frappe.require("assets/erpnext/js/stock_grid_report.js", function() {
erpnext.StockAnalytics = erpnext.StockGridReport.extend({ erpnext.StockAnalytics = erpnext.StockGridReport.extend({
init: function(wrapper, opts) { init: function(wrapper, opts) {
var args = { var args = {
@ -207,5 +207,4 @@ frappe.require("assets/erpnext/js/stock_grid_report.js", function() {
frappe.set_route("query-report", "Stock Ledger"); frappe.set_route("query-report", "Stock Ledger");
} }
}); });
}, false);

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

@ -1,7 +1,6 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt // License: GNU General Public License v3. See license.txt
frappe.require("assets/erpnext/js/stock_analytics.js", function() {
frappe.pages['stock-analytics'].on_page_load = function(wrapper) { frappe.pages['stock-analytics'].on_page_load = function(wrapper) {
frappe.ui.make_app_page({ frappe.ui.make_app_page({
parent: wrapper, parent: wrapper,
@ -9,8 +8,9 @@ frappe.require("assets/erpnext/js/stock_analytics.js", function() {
single_column: true single_column: true
}); });
frappe.require(["assets/erpnext/js/stock_grid_report.js",
"assets/erpnext/js/stock_analytics.js"], function() {
new erpnext.StockAnalytics(wrapper); new erpnext.StockAnalytics(wrapper);
frappe.breadcrumbs.add("Stock") frappe.breadcrumbs.add("Stock")
});
}; };
}, false);