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: delivery note from sales order uom conversion mistake (backport #46258) #46300

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 5, 2025

fixes #46196


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

(cherry picked from commit 49a43d3)

# Conflicts:
#	erpnext/selling/doctype/sales_order/sales_order.py
Copy link
Contributor Author

mergify bot commented Mar 5, 2025

Cherry-pick of 49a43d3 has failed:

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

You are currently cherry-picking commit 49a43d355d.
  (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/selling/doctype/sales_order/sales_order.py

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

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Mar 5, 2025
@mihir-kandoi mihir-kandoi merged commit 01db730 into version-15-hotfix Mar 5, 2025
11 checks passed
@mihir-kandoi mihir-kandoi deleted the mergify/bp/version-15-hotfix/pr-46258 branch March 5, 2025 08:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts needs-tests This PR needs automated unit-tests.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant