fix: multiple pricing rules with discount amount and discount percentage not working (backport #41211) (backport #41241) #41275
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
mergify
bot
requested review from
deepeshgarg007 and
ruthra-kumar
as code owners
frappe-pr-bot
pushed a commit
that referenced
this pull request
May 2, 2024
# [15.22.0](v15.21.2...v15.22.0) (2024-05-02) ### Bug Fixes * added brand column in Warehouse wise Item Balance Age and Value … (backport [#41280](#41280)) ([#41282](#41282)) ([4bbf0a4](4bbf0a4)) * advance account validation in company master ([dd67b0e](dd67b0e)) * args when get the delivery note in delivery trip ([61d6838](61d6838)) * args when get the delivery note in delivery trip ([e9acacd](e9acacd)) * basic rate for SABB ([7b79873](7b79873)) * compute tree-view parent field name ([#41234](#41234)) ([c3077ee](c3077ee)) * display term name for single term invoices ([a7d1a88](a7d1a88)) * duplicate column in the stock ledger report ([a62298a](a62298a)) * enable advance in separate acc only for customer and Supplier ([c3073d6](c3073d6)) * expense causing p&l test case to fail ([acfee42](acfee42)) * handle and receivable accounts based on response type ([f65b28a](f65b28a)) * handle stock balance unbuffered_cursor error (backport [#41186](#41186)) ([#41188](#41188)) ([b34582e](b34582e)) * Ignore user perm in Bank Reco Tool for company ([737c480](737c480)) * incorrectly applying TDS when Advance is in previous FY ([08f888a](08f888a)) * Invoice with no GLEs in deferred report ([44c3ad6](44c3ad6)) * missing def expense if no exp in first month ([0a65a37](0a65a37)) * mode of payment has precedance ([c6145a1](c6145a1)) * multiple pricing rules with discount amount and discount percentage not working (backport [#41211](#41211)) (backport [#41241](#41241)) ([#41275](#41275)) ([de77894](de77894)) * paid amount in bank reconciliation tool ([759c7f5](759c7f5)) * party and party type label on accounting preview ([ee9822f](ee9822f)) * permission issue when user permission restricts on company ([8d70a0e](8d70a0e)) * rendering the email template when user HTML ([3068dad](3068dad)) * test case for zero deferred expense ([23c3c3c](23c3c3c)) * validation to prevent foreign currency advance accounts in PE ([fb4a75c](fb4a75c)) * validation to prevent overallocation ([ea596eb](ea596eb)) * warehouse type filter for stock reports ([48351d6](48351d6)) ### Features * allow to do reposting for all transactions (audit) ([4555f8a](4555f8a))
|
🎉 This PR is included in version 15.22.0 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue
Multiple pricing rules with discount amount and discount percentage not working
This is an automatic backport of pull request #41211 done by [Mergify](https://mergify.com).
This is an automatic backport of pull request #41241 done by [Mergify](https://mergify.com).