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: handling of exchange rate journals in AR/AP (backport #38004) #38037

Merged
merged 1 commit into from
Nov 10, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 10, 2023

This is an automatic backport of pull request #38004 done by Mergify.
Cherry-pick of 1d8fcd6 has failed:

On branch mergify/bp/version-14/pr-38004
Your branch is up to date with 'origin/version-14'.

You are currently cherry-picking commit 1d8fcd66e6.
  (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/report/accounts_receivable/accounts_receivable.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/report/accounts_receivable/accounts_receivable.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 requested a review from deepeshgarg007 as a code owner November 10, 2023 06:30
@mergify mergify bot added the conflicts label Nov 10, 2023
@mergify mergify bot requested a review from ruthra-kumar as a code owner November 10, 2023 06:30
@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Nov 10, 2023
@ruthra-kumar ruthra-kumar force-pushed the mergify/bp/version-14/pr-38004 branch from 1c901f9 to 010ccf8 Compare November 10, 2023 06:35
@ruthra-kumar ruthra-kumar merged commit cb65522 into version-14 Nov 10, 2023
10 checks passed
@mergify mergify bot deleted the mergify/bp/version-14/pr-38004 branch November 10, 2023 07:45
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.47.4 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

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

Successfully merging this pull request may close these issues.

2 participants