Skip to content

fix: remove hardcoded doctype in make_return_doc (backport #47614) #47621

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

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 20, 2025

make_return_doc is used for numerous different transaction DocTypes, but somehow "Delivery Note" was hardcoded here.

I wonder how this went unnoticed for 6 years :D


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

Copy link
Contributor Author

mergify bot commented May 20, 2025

Cherry-pick of 45a5c19 has failed:

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

You are currently cherry-picking commit 45a5c19dd4.
  (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/controllers/sales_and_purchase_return.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 May 20, 2025
(cherry picked from commit 45a5c19)

# Conflicts:
#	erpnext/controllers/sales_and_purchase_return.py
@ruthra-kumar ruthra-kumar force-pushed the mergify/bp/version-14-hotfix/pr-47614 branch from 51036ed to 9ce86b1 Compare May 20, 2025 04:41
@ruthra-kumar ruthra-kumar merged commit 6f11092 into version-14-hotfix May 20, 2025
10 checks passed
@ruthra-kumar ruthra-kumar deleted the mergify/bp/version-14-hotfix/pr-47614 branch May 20, 2025 05:07
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.85.9 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-tests This PR needs automated unit-tests. released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants