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

feat: Provision to auto create Exchange Rate Revaluation (backport #36051) #36053

Merged
merged 3 commits into from
Jul 10, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 10, 2023

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

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

You are currently cherry-picking commit 6644311c8b.
  (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/setup/doctype/company/company.json

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

Cherry-pick of 4f51c5a has failed:

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

You are currently cherry-picking commit 4f51c5a433.
  (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
	modified:   erpnext/accounts/utils.py
	modified:   erpnext/hooks.py

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

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

(cherry picked from commit 6644311)

# Conflicts:
#	erpnext/setup/doctype/company/company.json
(cherry picked from commit 4f51c5a)

# Conflicts:
#	erpnext/setup/doctype/company/company.json
@mergify mergify bot added the conflicts label Jul 10, 2023
@github-actions github-actions bot added accounts needs-tests This PR needs automated unit-tests. labels Jul 10, 2023
@ruthra-kumar ruthra-kumar merged commit 681d48a into version-14-hotfix Jul 10, 2023
10 checks passed
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-36051 branch July 10, 2023 10:07
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.30.0 🎉

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 18, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
accounts conflicts needs-tests This PR needs automated unit-tests. released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants