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

Merge branch 'develop'

Browse Source
This commit is contained in:
mbauskar 2017-07-13 16:16:21 +05:30
commit 394c4d718d
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -2,7 +2,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
__version__ = '8.4.1' __version__ = '8.4.2'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

3
erpnext/selling/doctype/sales_order/sales_order.js
View File

@ -5,7 +5,6 @@
frappe.ui.form.on("Sales Order", { frappe.ui.form.on("Sales Order", {
setup: function(frm) { setup: function(frm) {
$.extend(frm.cscript, new erpnext.selling.SalesOrderController({frm: frm}));
frm.custom_make_buttons = { frm.custom_make_buttons = {
'Delivery Note': 'Delivery', 'Delivery Note': 'Delivery',
'Sales Invoice': 'Invoice', '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}));

5
erpnext/stock/doctype/delivery_note/delivery_note.js
View File

@ -63,7 +63,6 @@ frappe.ui.form.on("Delivery Note", {
}); });
$.extend(frm.cscript, new erpnext.stock.DeliveryNoteController({frm: frm}));
}, },
print_without_amount: function(frm) { print_without_amount: function(frm) {
erpnext.stock.delivery_note.set_print_hide(frm.doc); 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({ erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend({
setup: function(doc) { setup: function(doc) {
this.setup_posting_date_time_check(); 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', { frappe.ui.form.on('Delivery Note', {
setup: function(frm) { setup: function(frm) {
if(frm.doc.company) { 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; dn_fields['taxes'].print_hide = 0;
} }
} }

3
erpnext/stock/doctype/stock_entry/stock_entry.js
View File

@ -4,7 +4,6 @@ frappe.provide("erpnext.stock");
frappe.ui.form.on('Stock Entry', { frappe.ui.form.on('Stock Entry', {
setup: function(frm) { setup: function(frm) {
$.extend(frm.cscript, new erpnext.stock.StockEntry({frm: frm}));
frm.set_query('production_order', function() { frm.set_query('production_order', function() {
return { 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}));