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: valuation tax entries on LCV after billing PR (backport #40187) #41913

Merged
merged 6 commits into from
Jun 17, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 15, 2024

Bug

  • Create a Purchase Receipt with one or more tax rows having the charge type as "Valuation and Total".
  • Create a Purchase Invoice against the Purchase Receipt.
  • On creation of a Landed Cost Voucher against the PR now, the system creates the tax GL entries using the Stock Received But Not Billed account for the company.
  • Although, this should take place for the PR entries if any negative expenses are booked using the invoice, when the GL entries are posted through the LCV, the tax account heads mentioned in the PR should be used.

Fix

Do not change tax accounts for GL entries if the entries are getting reposted by the LCV.

Internal Ref: 16516, 16718


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

(cherry picked from commit baa3fee)

# Conflicts:
#	erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
(cherry picked from commit 53642e7)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
(cherry picked from commit 8b3d466)

# Conflicts:
#	erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
(cherry picked from commit 0b36cbe)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
(cherry picked from commit 54a58e9)

# Conflicts:
#	erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
Copy link
Contributor Author

mergify bot commented Jun 15, 2024

Cherry-pick of baa3fee has failed:

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

You are currently cherry-picking commit baa3fee1bf.
  (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/stock_controller.py
	modified:   erpnext/stock/doctype/purchase_receipt/purchase_receipt.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py

Cherry-pick of 53642e7 has failed:

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

You are currently cherry-picking commit 53642e7417.
  (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/stock_controller.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py

Cherry-pick of 8b3d466 has failed:

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

You are currently cherry-picking commit 8b3d46610e.
  (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/landed_cost_voucher/landed_cost_voucher.py
	both modified:   erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 0b36cbe has failed:

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

You are currently cherry-picking commit 0b36cbe307.
  (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")

Cherry-pick of 54a58e9 has failed:

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

You are currently cherry-picking commit 54a58e9205.
  (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/landed_cost_voucher/landed_cost_voucher.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 e3539ac into version-15-hotfix Jun 17, 2024
11 checks passed
@ruthra-kumar ruthra-kumar deleted the mergify/bp/version-15-hotfix/pr-40187 branch June 17, 2024 08:23
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.27.7 🎉

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 8, 2024
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.

3 participants