fix: Condition
(cherry picked from commit 2e0e6ca6b177043f673c05472ac3069f060d1563)
diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py
index 81001f5..29da5f1 100644
--- a/erpnext/controllers/taxes_and_totals.py
+++ b/erpnext/controllers/taxes_and_totals.py
@@ -123,7 +123,7 @@
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',