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

fix: only highest eligible coupon applied (#38416)

Browse Source 
fix: only highest eligible coupon applied (#38416)

* fix: application of pricing rule when coupon is used

(cherry picked from commit d34787cf6d37c479f00ac1c9bc529b544d95dab1)

Co-authored-by: sandratridz <102575830+sandratridz@users.noreply.github.com>
This commit is contained in:
mergify[bot] 2023-12-07 10:34:11 +05:30 committed by GitHub
parent eeb0567a73
commit aa66ee64ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/accounts/doctype/pricing_rule/utils.py
View File

@ -581,6 +581,8 @@ def apply_pricing_rule_on_transaction(doc):
if d.price_or_product_discount == "Price": if d.price_or_product_discount == "Price":
if d.apply_discount_on: if d.apply_discount_on:
doc.set("apply_discount_on", d.apply_discount_on) doc.set("apply_discount_on", d.apply_discount_on)
# Variable to track whether the condition has been met
condition_met = False
for field in ["additional_discount_percentage", "discount_amount"]: for field in ["additional_discount_percentage", "discount_amount"]:
pr_field = "discount_percentage" if field == "additional_discount_percentage" else field pr_field = "discount_percentage" if field == "additional_discount_percentage" else field
@ -603,6 +605,11 @@ def apply_pricing_rule_on_transaction(doc):
if coupon_code_pricing_rule == d.name: if coupon_code_pricing_rule == d.name:
# if selected coupon code is linked with pricing rule # if selected coupon code is linked with pricing rule
doc.set(field, d.get(pr_field)) doc.set(field, d.get(pr_field))
# Set the condition_met variable to True and break out of the loop
condition_met = True
break
else: else:
# reset discount if not linked # reset discount if not linked
doc.set(field, 0) doc.set(field, 0)
@ -611,6 +618,10 @@ def apply_pricing_rule_on_transaction(doc):
doc.set(field, 0) doc.set(field, 0)
doc.calculate_taxes_and_totals() doc.calculate_taxes_and_totals()
# Break out of the main loop if the condition is met
if condition_met:
break
elif d.price_or_product_discount == "Product": elif d.price_or_product_discount == "Product":
item_details = frappe._dict({"parenttype": doc.doctype, "free_item_data": []}) item_details = frappe._dict({"parenttype": doc.doctype, "free_item_data": []})
get_product_discount_rule(d, item_details, doc=doc) get_product_discount_rule(d, item_details, doc=doc)