mirror of
https://github.com/frappe/erpnext.git
synced 2026-09-18 02:55:20 +00:00
[fixed] frappe.require is now async 💥
This commit is contained in:
@@ -2,7 +2,6 @@
|
||||
// License: GNU General Public License v3. See license.txt
|
||||
|
||||
frappe.provide("erpnext.item");
|
||||
frappe.require('assets/js/item-dashboard.min.js');
|
||||
|
||||
frappe.ui.form.on("Item", {
|
||||
onload: function(frm) {
|
||||
@@ -77,17 +76,6 @@ frappe.ui.form.on("Item", {
|
||||
|
||||
erpnext.item.toggle_attributes(frm);
|
||||
|
||||
frm.dashboard.show_heatmap = frm.doc.is_stock_item;
|
||||
frm.dashboard.heatmap_message = __('This is based on stock movement. See {0} for details',
|
||||
['<a href="#query-report/Stock Ledger">' + __('Stock Ledger') + '</a>']);
|
||||
frm.dashboard.show_dashboard();
|
||||
|
||||
var section = frm.dashboard.add_section('<h5 style="margin-top: 0px;">Stock Levels</h5>');
|
||||
erpnext.item.item_dashboard = new erpnext.stock.ItemDashboard({
|
||||
parent: section,
|
||||
item_code: frm.doc.name
|
||||
});
|
||||
erpnext.item.item_dashboard.refresh();
|
||||
|
||||
},
|
||||
|
||||
@@ -184,6 +172,20 @@ $.extend(erpnext.item, {
|
||||
frm.dashboard.reset();
|
||||
if(frm.doc.__islocal)
|
||||
return;
|
||||
|
||||
frm.dashboard.show_heatmap = frm.doc.is_stock_item;
|
||||
frm.dashboard.heatmap_message = __('This is based on stock movement. See {0} for details',
|
||||
['<a href="#query-report/Stock Ledger">' + __('Stock Ledger') + '</a>']);
|
||||
frm.dashboard.show_dashboard();
|
||||
|
||||
frappe.require('assets/js/item-dashboard.min.js', function() {
|
||||
var section = frm.dashboard.add_section('<h5 style="margin-top: 0px;">Stock Levels</h5>');
|
||||
erpnext.item.item_dashboard = new erpnext.stock.ItemDashboard({
|
||||
parent: section,
|
||||
item_code: frm.doc.name
|
||||
});
|
||||
erpnext.item.item_dashboard.refresh();
|
||||
});
|
||||
},
|
||||
|
||||
edit_prices_button: function(frm) {
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
|
||||
|
||||
frappe.provide("erpnext.stock");
|
||||
frappe.require("assets/erpnext/js/controllers/stock_controller.js");
|
||||
|
||||
erpnext.stock.LandedCostVoucher = erpnext.stock.StockController.extend({
|
||||
setup: function() {
|
||||
@@ -11,16 +10,16 @@ erpnext.stock.LandedCostVoucher = erpnext.stock.StockController.extend({
|
||||
this.frm.fields_dict.purchase_receipts.grid.get_field('receipt_document').get_query =
|
||||
function(doc, cdt ,cdn) {
|
||||
var d = locals[cdt][cdn]
|
||||
|
||||
|
||||
var filters = [
|
||||
[d.receipt_document_type, 'docstatus', '=', '1'],
|
||||
[d.receipt_document_type, 'company', '=', me.frm.doc.company],
|
||||
]
|
||||
|
||||
|
||||
if(d.receipt_document_type == "Purchase Invoice") {
|
||||
filters.push(["Purchase Invoice", "update_stock", "=", "1"])
|
||||
}
|
||||
|
||||
|
||||
if(!me.frm.doc.company) msgprint(__("Please enter company first"));
|
||||
return {
|
||||
filters:filters
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
{% include 'erpnext/buying/doctype/purchase_common/purchase_common.js' %};
|
||||
|
||||
frappe.require("assets/erpnext/js/utils.js");
|
||||
|
||||
|
||||
frappe.ui.form.on("Material Request Item", {
|
||||
"qty": function(frm, doctype, name) {
|
||||
|
||||
@@ -1,10 +1,5 @@
|
||||
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // License: GNU General Public License v3. See license.txt
|
||||
|
||||
frappe.require([
|
||||
"assets/erpnext/js/controllers/stock_controller.js",
|
||||
"assets/erpnext/js/utils.js",
|
||||
"assets/erpnext/js/utils/item_selector.js"]);
|
||||
|
||||
frappe.provide("erpnext.stock");
|
||||
|
||||
erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
|
||||
// License: GNU General Public License v3. See license.txt
|
||||
|
||||
frappe.require("assets/erpnext/js/controllers/stock_controller.js");
|
||||
frappe.require("assets/erpnext/js/utils.js");
|
||||
frappe.provide("erpnext.stock");
|
||||
|
||||
frappe.ui.form.on("Stock Reconciliation", {
|
||||
|
||||
@@ -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")
|
||||
};
|
||||
});
|
||||
|
||||
@@ -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');
|
||||
|
||||
}
|
||||
@@ -1,8 +1,9 @@
|
||||
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
|
||||
// License: GNU General Public License v3. See license.txt
|
||||
|
||||
frappe.require("assets/erpnext/js/sales_trends_filters.js");
|
||||
frappe.require("assets/erpnext/js/sales_trends_filters.js", function() {
|
||||
frappe.query_reports["Delivery Note Trends"] = {
|
||||
filters: get_filters()
|
||||
}
|
||||
});
|
||||
|
||||
frappe.query_reports["Delivery Note Trends"] = {
|
||||
filters: get_filters()
|
||||
}
|
||||
@@ -1,8 +1,9 @@
|
||||
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
|
||||
// License: GNU General Public License v3. See license.txt
|
||||
|
||||
frappe.require("assets/erpnext/js/purchase_trends_filters.js");
|
||||
frappe.require("assets/erpnext/js/purchase_trends_filters.js", function() {
|
||||
frappe.query_reports["Purchase Receipt Trends"] = {
|
||||
filters: get_filters()
|
||||
}
|
||||
});
|
||||
|
||||
frappe.query_reports["Purchase Receipt Trends"] = {
|
||||
filters: get_filters()
|
||||
}
|
||||
Reference in New Issue
Block a user