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: don't merge tax into stock account on purchase receipt repost (backport #42247) #42271

Merged
merged 3 commits into from
Jul 10, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 10, 2024

Consider Purchase Order -> Purchase Receipt -> Purchase Invoice. In this scenario, there is no LCV and the tax accounts are posted to both Purchase Receipt and Invoice. But, if a backdated repost is triggered (Item Code and Warehouse), tax amount is incorrectly merged into stock account.

continues: #42073


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

(cherry picked from commit 9562628)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
@mergify mergify bot requested a review from rohitwaghchaure as a code owner July 10, 2024 09:58
@mergify mergify bot added the conflicts label Jul 10, 2024
@mergify mergify bot requested a review from s-aga-r as a code owner July 10, 2024 09:58
Copy link
Contributor Author

mergify bot commented Jul 10, 2024

Cherry-pick of 9562628 has failed:

On branch mergify/bp/version-14-hotfix/pr-42247
Your branch is ahead of 'origin/version-14-hotfix' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 9562628ed6.
  (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/stock/doctype/purchase_receipt/test_purchase_receipt.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

@ruthra-kumar ruthra-kumar merged commit 5c75bb8 into version-14-hotfix Jul 10, 2024
10 checks passed
@ruthra-kumar ruthra-kumar deleted the mergify/bp/version-14-hotfix/pr-42247 branch July 10, 2024 10:22
@frappe-pr-bot
Copy link
Collaborator

🎉 This issue has been resolved in version 14.70.10 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 25, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants