fix: Update bundle paths
This commit is contained in:
parent
ff3b71d2e7
commit
464d838447
@ -15,7 +15,7 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
|
|||||||
},
|
},
|
||||||
|
|
||||||
refresh: function (frm) {
|
refresh: function (frm) {
|
||||||
frappe.require("assets/js/bank-reconciliation-tool.min.js", () =>
|
frappe.require("bank-reconciliation-tool.bundle.js", () =>
|
||||||
frm.trigger("make_reconciliation_tool")
|
frm.trigger("make_reconciliation_tool")
|
||||||
);
|
);
|
||||||
frm.upload_statement_button = frm.page.set_secondary_action(
|
frm.upload_statement_button = frm.page.set_secondary_action(
|
||||||
|
@ -319,7 +319,7 @@ frappe.ui.form.on("Bank Statement Import", {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
frappe.require("/assets/js/data_import_tools.min.js", () => {
|
frappe.require("data_import_tools.bundle.js", () => {
|
||||||
frm.import_preview = new frappe.data_import.ImportPreview({
|
frm.import_preview = new frappe.data_import.ImportPreview({
|
||||||
wrapper: frm.get_field("import_preview").$wrapper,
|
wrapper: frm.get_field("import_preview").$wrapper,
|
||||||
doctype: frm.doc.reference_doctype,
|
doctype: frm.doc.reference_doctype,
|
||||||
|
@ -15,10 +15,11 @@ app_logo_url = "/assets/erpnext/images/erpnext-logo.svg"
|
|||||||
|
|
||||||
develop_version = '13.x.x-develop'
|
develop_version = '13.x.x-develop'
|
||||||
|
|
||||||
app_include_js = "/assets/js/erpnext.min.js"
|
app_include_js = "erpnext.bundle.js"
|
||||||
app_include_css = "/assets/css/erpnext.css"
|
app_include_css = "erpnext.bundle.css"
|
||||||
web_include_js = "/assets/js/erpnext-web.min.js"
|
web_include_js = "erpnext-web.bundle.js"
|
||||||
web_include_css = "/assets/css/erpnext-web.css"
|
web_include_css = "erpnext-web.bundle.css"
|
||||||
|
email_css = "email.bundle.css"
|
||||||
|
|
||||||
doctype_js = {
|
doctype_js = {
|
||||||
"Address": "public/js/address.js",
|
"Address": "public/js/address.js",
|
||||||
|
@ -19,11 +19,7 @@ frappe.views.MarketplaceFactory = class MarketplaceFactory extends frappe.views.
|
|||||||
}
|
}
|
||||||
|
|
||||||
make(page_name) {
|
make(page_name) {
|
||||||
const assets = [
|
frappe.require('marketplace.bundle.js', () => {
|
||||||
'/assets/js/marketplace.min.js'
|
|
||||||
];
|
|
||||||
|
|
||||||
frappe.require(assets, () => {
|
|
||||||
erpnext.hub.marketplace = new erpnext.hub.Marketplace({
|
erpnext.hub.marketplace = new erpnext.hub.Marketplace({
|
||||||
parent: this.make_page(true, page_name)
|
parent: this.make_page(true, page_name)
|
||||||
});
|
});
|
||||||
|
@ -7,7 +7,7 @@ frappe.pages['point-of-sale'].on_page_load = function(wrapper) {
|
|||||||
single_column: true
|
single_column: true
|
||||||
});
|
});
|
||||||
|
|
||||||
frappe.require('assets/js/point-of-sale.min.js', function() {
|
frappe.require('point-of-sale.bundle.js', function() {
|
||||||
wrapper.pos = new erpnext.PointOfSale.Controller(wrapper);
|
wrapper.pos = new erpnext.PointOfSale.Controller(wrapper);
|
||||||
window.cur_pos = wrapper.pos;
|
window.cur_pos = wrapper.pos;
|
||||||
});
|
});
|
||||||
@ -19,4 +19,4 @@ frappe.pages['point-of-sale'].refresh = function(wrapper) {
|
|||||||
wrapper.pos.wrapper.html("");
|
wrapper.pos.wrapper.html("");
|
||||||
wrapper.pos.check_opening_entry();
|
wrapper.pos.check_opening_entry();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -379,7 +379,7 @@ $.extend(erpnext.item, {
|
|||||||
|
|
||||||
// Show Stock Levels only if is_stock_item
|
// Show Stock Levels only if is_stock_item
|
||||||
if (frm.doc.is_stock_item) {
|
if (frm.doc.is_stock_item) {
|
||||||
frappe.require('assets/js/item-dashboard.min.js', function() {
|
frappe.require('item-dashboard.bundle.js', function() {
|
||||||
const section = frm.dashboard.add_section('', __("Stock Levels"));
|
const section = frm.dashboard.add_section('', __("Stock Levels"));
|
||||||
erpnext.item.item_dashboard = new erpnext.stock.ItemDashboard({
|
erpnext.item.item_dashboard = new erpnext.stock.ItemDashboard({
|
||||||
parent: section,
|
parent: section,
|
||||||
|
@ -62,7 +62,7 @@ frappe.pages['stock-balance'].on_page_load = function(wrapper) {
|
|||||||
|
|
||||||
// page.sort_selector.wrapper.css({'margin-right': '15px', 'margin-top': '4px'});
|
// page.sort_selector.wrapper.css({'margin-right': '15px', 'margin-top': '4px'});
|
||||||
|
|
||||||
frappe.require('assets/js/item-dashboard.min.js', function() {
|
frappe.require('item-dashboard.bundle.js', function() {
|
||||||
page.item_dashboard = new erpnext.stock.ItemDashboard({
|
page.item_dashboard = new erpnext.stock.ItemDashboard({
|
||||||
parent: page.main,
|
parent: page.main,
|
||||||
page_length: 20,
|
page_length: 20,
|
||||||
|
@ -79,7 +79,7 @@ frappe.pages['warehouse-capacity-summary'].on_page_load = function(wrapper) {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
frappe.require('assets/js/item-dashboard.min.js', function() {
|
frappe.require('item-dashboard.bundle.js', function() {
|
||||||
$(frappe.render_template('warehouse_capacity_summary_header')).appendTo(page.main);
|
$(frappe.render_template('warehouse_capacity_summary_header')).appendTo(page.main);
|
||||||
|
|
||||||
page.capacity_dashboard = new erpnext.stock.ItemDashboard({
|
page.capacity_dashboard = new erpnext.stock.ItemDashboard({
|
||||||
@ -117,4 +117,4 @@ frappe.pages['warehouse-capacity-summary'].on_page_load = function(wrapper) {
|
|||||||
setup_click('Item');
|
setup_click('Item');
|
||||||
setup_click('Warehouse');
|
setup_click('Warehouse');
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
@ -28,9 +28,7 @@
|
|||||||
|
|
||||||
{% block base_scripts %}
|
{% block base_scripts %}
|
||||||
<!-- js should be loaded in body! -->
|
<!-- js should be loaded in body! -->
|
||||||
<script type="text/javascript" src="/assets/frappe/js/lib/jquery/jquery.min.js"></script>
|
{{ include_script("frappe-web.bundle.js") }}
|
||||||
<script type="text/javascript" src="/assets/js/frappe-web.min.js"></script>
|
{{ include_script("controls.bundle.js") }}
|
||||||
<script type="text/javascript" src="/assets/js/control.min.js"></script>
|
{{ include_script("dialog.bundle.js") }}
|
||||||
<script type="text/javascript" src="/assets/js/dialog.min.js"></script>
|
{% endblock %}
|
||||||
<script type="text/javascript" src="/assets/js/bootstrap-4-web.min.js"></script>
|
|
||||||
{% endblock %}
|
|
||||||
|
@ -139,9 +139,7 @@
|
|||||||
|
|
||||||
{% block base_scripts %}
|
{% block base_scripts %}
|
||||||
<!-- js should be loaded in body! -->
|
<!-- js should be loaded in body! -->
|
||||||
<script type="text/javascript" src="/assets/frappe/js/lib/jquery/jquery.min.js"></script>
|
{{ include_script("frappe-web.bundle.js") }}
|
||||||
<script type="text/javascript" src="/assets/js/frappe-web.min.js"></script>
|
{{ include_script("controls.bundle.js") }}
|
||||||
<script type="text/javascript" src="/assets/js/control.min.js"></script>
|
{{ include_script("dialog.bundle.js") }}
|
||||||
<script type="text/javascript" src="/assets/js/dialog.min.js"></script>
|
|
||||||
<script type="text/javascript" src="/assets/js/bootstrap-4-web.min.js"></script>
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user