Fixed version conflict

2016-10-26 16:41:21 +05:30
parent 2e12a76d18 4c0a9f420f
commit 72a1943c8e
4 changed files with 15 additions and 8 deletions
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -710,7 +710,8 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 					"brand": d.brand,
 					"qty": d.qty,
 					"parenttype": d.parenttype,
-					"parent": d.parent
+					"parent": d.parent,
+					"pricing_rule": d.pricing_rule
 				});

 				// if doctype is Quotation Item / Sales Order Iten then add Margin Type and rate in item_list