Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Feb 2, 2026

Reference support ticket


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

(cherry picked from commit 135a433)

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

mergify bot commented Feb 2, 2026

Cherry-pick of 135a433 has failed:

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

You are currently cherry-picking commit 135a433018.
  (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/controllers/selling_controller.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

@mihir-kandoi mihir-kandoi merged commit e1c71e0 into version-15-hotfix Feb 3, 2026
13 checks passed
@mihir-kandoi mihir-kandoi deleted the mergify/bp/version-15-hotfix/pr-52246 branch February 3, 2026 04:14
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.

1 participant