commit 5738dd473cee418cdf9abbbb1fe7bdebaa1fc86d
author mbauskar <mbauskar@gmail.com> Mon Jan 18 16:24:57 2016 +0530
committer rohitwaghchaure <rohitw1991@gmail.com> Thu Mar 24 14:07:49 2016 +0530
tree 387abe6fec425dfb13813397c7c7b84284900112
parent 1e9c1640fa9d244810f4b7860d2679e185eada04

set the target.ignore_pricing_rule to 0

erpnext/selling/doctype/quotation/quotation.py

diff --git a/erpnext/selling/doctype/quotation/quotation.py b/erpnext/selling/doctype/quotation/quotation.py
index 3c8add4..c180c41 100644
--- a/erpnext/selling/doctype/quotation/quotation.py
+++ b/erpnext/selling/doctype/quotation/quotation.py
@@ -91,7 +91,9 @@
 		if customer:
 			target.customer = customer.name
 			target.customer_name = customer.customer_name
-		target.ignore_pricing_rule = 1
+		# changed from 1 to 0, because margin is applied based on pricing rule. 
+		# User will manually disabled pricing rule on sales order.
+		target.ignore_pricing_rule = 0
 		target.flags.ignore_permissions = ignore_permissions
 		target.run_method("set_missing_values")
 		target.run_method("calculate_taxes_and_totals")