Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: add currency in options for rate field in pricing rule (backport #43239) #43268

Merged
merged 2 commits into from
Sep 18, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 18, 2024

Issue:
Not showing appropriate currency symbol in rate field in pricing rule list view
https://support.frappe.io/helpdesk/tickets/22014

Before fix:
Before fix

After fix:
After fix

Backport needed:
v15


This is an automatic backport of pull request #43239 done by Mergify.

(cherry picked from commit 636c013)

# Conflicts:
#	erpnext/accounts/doctype/pricing_rule/pricing_rule.json
Copy link
Contributor Author

mergify bot commented Sep 18, 2024

Cherry-pick of 636c013 has failed:

On branch mergify/bp/version-15-hotfix/pr-43239
Your branch is up to date with 'origin/version-15-hotfix'.

You are currently cherry-picking commit 636c0131fa.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/doctype/pricing_rule/pricing_rule.json

no changes added to commit (use "git add" and/or "git commit -a")

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

@ruthra-kumar ruthra-kumar merged commit 7aeadcb into version-15-hotfix Sep 18, 2024
11 checks passed
@ruthra-kumar ruthra-kumar deleted the mergify/bp/version-15-hotfix/pr-43239 branch September 18, 2024 06:59
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 3, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants