commit 6f3d04caf72298acb3b0c07a23f063d8fee4ecc5
author Rohit Waghchaure <rohitw1991@gmail.com> Mon Oct 03 11:46:04 2016 +0530
committer Rohit Waghchaure <rohitw1991@gmail.com> Mon Oct 03 11:46:04 2016 +0530
tree 1d49a8c7a6d67b8bbf23d819b0bced9b95efe573
parent 6870e45276500f66794ebc1a239224523f6936a3

[Fix] Disable apply discount on

erpnext/accounts/doctype/sales_invoice/pos.py

diff --git a/erpnext/accounts/doctype/sales_invoice/pos.py b/erpnext/accounts/doctype/sales_invoice/pos.py
index 5336b54..062c6cd 100644
--- a/erpnext/accounts/doctype/sales_invoice/pos.py
+++ b/erpnext/accounts/doctype/sales_invoice/pos.py
@@ -66,7 +66,7 @@
 	doc.naming_series = pos_profile.get('naming_series') or 'SINV-'
 	doc.letter_head = pos_profile.get('letter_head') or company_data.default_letter_head
 	doc.ignore_pricing_rule = pos_profile.get('ignore_pricing_rule') or 0
-	doc.apply_discount_on = pos_profile.get('apply_discount_on') or ''
+	doc.apply_discount_on = pos_profile.get('apply_discount_on') if pos_profile.get('apply_discount') else ''
 	doc.customer_group = pos_profile.get('customer_group') or get_root('Customer Group')
 	doc.territory = pos_profile.get('territory') or get_root('Territory')