fix: Condition

(cherry picked from commit 2e0e6ca6b1)
2022-03-25 12:39:59 +05:30
parent 6c23dea716
commit def18f2b13
1 changed files with 1 additions and 1 deletions
--- a/erpnext/controllers/taxes_and_totals.py
+++ b/erpnext/controllers/taxes_and_totals.py
@@ -123,7 +123,7 @@ class calculate_taxes_and_totals(object):

 						item.discount_amount = item.price_list_rate * (item.discount_percentage / 100.0)

-					elif item.discount_amount or item.pricing_rules:
+					elif item.discount_amount and item.pricing_rules:
 						item.rate =  item.price_list_rate - item.discount_amount

 				if item.doctype in ['Quotation Item', 'Sales Order Item', 'Delivery Note Item', 'Sales Invoice Item',