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: date added to wrong patch (backport #46627) #46634

Merged
merged 2 commits into from
Mar 25, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 20, 2025

I don't know how I made this mistake but in PR #46573, I added the date to rerun the recalculate_amount_difference_field patch to rename_field_from_rate_difference_to_amount_difference instead.


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

(cherry picked from commit dc45c3b)

# Conflicts:
#	erpnext/patches.txt
@mergify mergify bot added the conflicts label Mar 20, 2025
Copy link
Contributor Author

mergify bot commented Mar 20, 2025

Cherry-pick of dc45c3b has failed:

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

You are currently cherry-picking commit dc45c3b39c.
  (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/patches.txt

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 288206b into version-15-hotfix Mar 25, 2025
11 checks passed
@ruthra-kumar ruthra-kumar deleted the mergify/bp/version-15-hotfix/pr-46627 branch March 25, 2025 13:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants