diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 10215d127b..ef9b89c43b 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals import frappe -__version__ = '8.4.1' +__version__ = '8.4.2' def get_default_company(user=None): '''Get default company for user''' diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index 2ba2aba863..457b6aad84 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -5,7 +5,6 @@ frappe.ui.form.on("Sales Order", { setup: function(frm) { - $.extend(frm.cscript, new erpnext.selling.SalesOrderController({frm: frm})); frm.custom_make_buttons = { 'Delivery Note': 'Delivery', 'Sales Invoice': 'Invoice', @@ -347,3 +346,5 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( } } }); + +$.extend(cur_frm.cscript, new erpnext.selling.SalesOrderController({frm: cur_frm})); diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js index c441df2237..46d536dace 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.js +++ b/erpnext/stock/doctype/delivery_note/delivery_note.js @@ -63,7 +63,6 @@ frappe.ui.form.on("Delivery Note", { }); - $.extend(frm.cscript, new erpnext.stock.DeliveryNoteController({frm: frm})); }, print_without_amount: function(frm) { erpnext.stock.delivery_note.set_print_hide(frm.doc); @@ -86,7 +85,6 @@ frappe.ui.form.on("Delivery Note Item", { } }); - erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend({ setup: function(doc) { this.setup_posting_date_time_check(); @@ -225,6 +223,8 @@ erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend( }); +$.extend(cur_frm.cscript, new erpnext.stock.DeliveryNoteController({frm: cur_frm})); + frappe.ui.form.on('Delivery Note', { setup: function(frm) { if(frm.doc.company) { @@ -268,3 +268,4 @@ erpnext.stock.delivery_note.set_print_hide = function(doc, cdt, cdn){ dn_fields['taxes'].print_hide = 0; } } + diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js index 1214346a53..5315253f7e 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.js +++ b/erpnext/stock/doctype/stock_entry/stock_entry.js @@ -4,7 +4,6 @@ frappe.provide("erpnext.stock"); frappe.ui.form.on('Stock Entry', { setup: function(frm) { - $.extend(frm.cscript, new erpnext.stock.StockEntry({frm: frm})); frm.set_query('production_order', function() { return { @@ -583,3 +582,5 @@ erpnext.stock.select_batch_and_serial_no = (frm, item) => { }); } + +$.extend(cur_frm.cscript, new erpnext.stock.StockEntry({frm: cur_frm}));