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: Exchange Rate Revaluation should only post on the currency that has balance in a 'zero' balance account (backport #35794) #35803

Merged
merged 4 commits into from
Jun 20, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 20, 2023

This is an automatic backport of pull request #35794 done by Mergify.
Cherry-pick of 4567474 has failed:

On branch mergify/bp/version-14-hotfix/pr-35794
Your branch is ahead of 'origin/version-14-hotfix' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 4567474418.
  (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/exchange_rate_revaluation/exchange_rate_revaluation.py

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

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot added the conflicts label Jun 20, 2023
@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Jun 20, 2023
@ruthra-kumar ruthra-kumar force-pushed the mergify/bp/version-14-hotfix/pr-35794 branch from 1bb9207 to 65d24ea Compare June 20, 2023 08:32
@ruthra-kumar ruthra-kumar merged commit bf2ebce into version-14-hotfix Jun 20, 2023
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-35794 branch June 20, 2023 09:19
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.27.9 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 24, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
conflicts needs-tests This PR needs automated unit-tests. released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants