Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Oct 7, 2025

Issue: User can use a disabled Item Tax Template in a transaction.

Frappe Support Issue: https://support.frappe.io/app/hd-ticket/49204


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

(cherry picked from commit b10cf4a)

# Conflicts:
#	erpnext/public/js/controllers/transaction.js
#	erpnext/stock/get_item_details.py
@mergify mergify bot requested a review from rohitwaghchaure as a code owner October 7, 2025 05:26
@mergify mergify bot added the conflicts label Oct 7, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Oct 7, 2025

Cherry-pick of b10cf4a has failed:

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

You are currently cherry-picking commit b10cf4a928.
  (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/public/js/controllers/transaction.js
	both modified:   erpnext/stock/get_item_details.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 needs-tests This PR needs automated unit-tests. stock labels Oct 7, 2025
@rohitwaghchaure rohitwaghchaure removed needs-tests This PR needs automated unit-tests. conflicts labels Oct 7, 2025
@rohitwaghchaure rohitwaghchaure merged commit 03aeac6 into version-14-hotfix Oct 7, 2025
12 checks passed
@rohitwaghchaure rohitwaghchaure deleted the mergify/bp/version-14-hotfix/pr-49702 branch October 7, 2025 06:24
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.92.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 22, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants