Closed mergify[bot] closed 1 month ago
Cherry-pick of 5cf5b18aea34f825cd024194e8e02cb7c0704230 has failed:
On branch mergify/bp/version-15-hotfix/pr-41516
Your branch is up to date with 'origin/version-15-hotfix'.
You are currently cherry-picking commit 5cf5b18aea.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
modified: erpnext/accounts/doctype/pricing_rule/pricing_rule.py
modified: erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py
modified: erpnext/accounts/doctype/pricing_rule/utils.py
modified: erpnext/patches.txt
new file: erpnext/patches/v14_0/enable_set_priority_for_pricing_rules.py
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: erpnext/accounts/doctype/pricing_rule/pricing_rule.json
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
:tada: This PR is included in version 15.25.0 :tada:
The release is available on GitHub release
Your semantic-release bot :package::rocket:
Issue
Problem
Here if the apply multiple pricing rules has not enabled then system not consider the pricing rules set on the Item Group and Brand.
Solution
To fix the issue, added the "Has Priority" checkbox to know whether the Priority has to be consider or not
This is an automatic backport of pull request #41516 done by Mergify.