Merge branch 'develop' into item-discount

2019-05-01 12:23:30 +05:30
parent 64bfdd9596 39f58ae92b
commit b8103ac077
240 changed files with 13555 additions and 4937 deletions
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -1200,6 +1200,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 					"qty": d.qty,
 					"stock_qty": d.stock_qty,
 					"uom": d.uom,
+					"stock_uom": d.stock_uom,
 					"parenttype": d.parenttype,
 					"parent": d.parent,
 					"pricing_rules": d.pricing_rules,