Merge branch 'master' into develop

2019-02-12 16:41:24 +05:30
parent 1bfdceaf7e e11f2c0107
commit 551f52fd25
21 changed files with 92 additions and 64 deletions
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -314,8 +314,9 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 					show_description(child.idx, r.message.item_code, child.item_code);

 					frappe.model.set_value(child.doctype, child.name, {
-						"item_code": r.message.item_code,
-						"qty": (child.qty || 0) + 1
+						item_code: r.message.item_code,
+						qty: (child.qty || 0) + 1,
+						barcode: r.message.barcode
 					});
 				}
 				else{