nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-16 10:20:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source
This commit is contained in:
mbauskar
2017-08-14 09:31:01 +05:30
parent 08c3f4758e 41d77e8d86
commit f03afe0878
15 changed files with 328 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/public/js/controllers/transaction.js
View File

@@ -261,7 +261,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
var item = frappe.get_doc(cdt, cdn);
var update_stock = 0, show_batch_dialog = 0;
if(['Sales Invoice', 'Purchase Invoice'].includes(this.frm.doc.doctype)) {
if(['Sales Invoice'].includes(this.frm.doc.doctype)) {
update_stock = cint(me.frm.doc.update_stock);
show_batch_dialog = update_stock;