Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Condition

Browse Source 
(cherry picked from commit 2e0e6ca6b177043f673c05472ac3069f060d1563)
This commit is contained in:
Deepesh Garg 2022-03-25 12:39:59 +05:30 committed by mergify-bot
parent a83a0a03b1
commit 97e102ceef
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/controllers/taxes_and_totals.py
View File

@ -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',