nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 19:59:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fixed] frappe.require is now async 💥

Browse Source
This commit is contained in:
Rushabh Mehta
2016-04-29 17:22:42 +05:30
parent 127de729b2
commit be2ee18de4
40 changed files with 565 additions and 550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,19 +1,16 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// 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.ui.make_app_page({
parent: wrapper,
title: __('Stock Analytics'),
single_column: true
});
frappe.pages['stock-analytics'].on_page_load = function(wrapper) {
frappe.ui.make_app_page({
parent: wrapper,
title: __('Stock Analytics'),
single_column: true
});
new erpnext.StockAnalytics(wrapper);
new erpnext.StockAnalytics(wrapper);
frappe.breadcrumbs.add("Stock")
};
frappe.require("assets/erpnext/js/stock_analytics.js");
frappe.breadcrumbs.add("Stock")
};
});

51
erpnext/stock/page/stock_balance/stock_balance.js
View File

@@ -1,5 +1,3 @@
frappe.require('assets/js/item-dashboard.min.js');
frappe.pages['stock-balance'].on_page_load = function(wrapper) {
var page = frappe.ui.make_app_page({
parent: wrapper,
@@ -52,32 +50,35 @@ frappe.pages['stock-balance'].on_page_load = function(wrapper) {
page.sort_selector.wrapper.css({'margin-right': '15px', 'margin-top': '4px'});
page.item_dashboard = new erpnext.stock.ItemDashboard({
parent: page.main,
})
frappe.require('assets/js/item-dashboard.min.js', function() {
page.item_dashboard = new erpnext.stock.ItemDashboard({
parent: page.main,
})
page.item_dashboard.before_refresh = function() {
this.item_code = page.item_field.get_value();
this.warehouse = page.warehouse_field.get_value();
}
page.item_dashboard.before_refresh = function() {
this.item_code = page.item_field.get_value();
this.warehouse = page.warehouse_field.get_value();
}
page.item_dashboard.refresh();
page.item_dashboard.refresh();
// item click
var setup_click = function(doctype) {
page.main.on('click', 'a[data-type="'+ doctype.toLowerCase() +'"]', function() {
var name = $(this).attr('data-name');
var field = page[doctype.toLowerCase() + '_field'];
if(field.get_value()===name) {
frappe.set_route('Form', doctype, name)
} else {
field.set_input(name);
page.item_dashboard.refresh();
}
});
}
// item click
var setup_click = function(doctype) {
page.main.on('click', 'a[data-type="'+ doctype.toLowerCase() +'"]', function() {
var name = $(this).attr('data-name');
var field = page[doctype.toLowerCase() + '_field'];
if(field.get_value()===name) {
frappe.set_route('Form', doctype, name)
} else {
field.set_input(name);
page.item_dashboard.refresh();
}
});
}
setup_click('Item');
setup_click('Warehouse');
});
setup_click('Item');
setup_click('Warehouse');
}