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: incorrect valuation for sales return with different warhouse (backport #45259) #45268

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 14, 2025

(cherry picked from commit 3a2e816)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/test_delivery_note.py
Copy link
Contributor Author

mergify bot commented Jan 14, 2025

Cherry-pick of 3a2e816 has failed:

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

You are currently cherry-picking commit 3a2e816759.
  (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/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/stock/doctype/delivery_note/test_delivery_note.py

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

@rohitwaghchaure rohitwaghchaure merged commit 88c10fa into version-15-hotfix Jan 14, 2025
11 checks passed
@rohitwaghchaure rohitwaghchaure deleted the mergify/bp/version-15-hotfix/pr-45259 branch January 14, 2025 15:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant