[go: up one dir, main page]

fix: multiple pricing rules with discount amount and discount percentage not working (backport #41211) by mergify[bot] [frappe] PR#41241

Bot Dokosrequested to merge
ft-pr-41241 into develop

From: https://github.com/frappe/erpnext/pull/41241
Date: 2024-04-30 21:48:46+05:30

  • fix: multiple pricing rules with discount amount and discount percentage not working (backport #41211) (#41241)


Checkout instructions 
# Checkout locally
git fetch upstream
git switch ft-pr-41241

# Alternatively, re-take the changes
git switch develop
ft take ft-pr-41241

# Make changes then rebase
git rebase -i develop

# Fix or ignore conflicts
git checkout --theirs .
git rebase --continue

# Force-push changes
git push --force-with-lease

Merge request reports