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: set landed cost based on purchase invoice rate (backport #45947) #46317

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 5, 2025

Reference support ticket 31369

The feature "Set Landed Cost Based on Purchase Invoice Rate" was not considering quantity of items when calculating the new incoming rate.

Note: This PR contains a patch


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

(cherry picked from commit 17d415b)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
#	erpnext/patches.txt
#	erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
(cherry picked from commit a410248)
(cherry picked from commit 7cf8e49)
(cherry picked from commit 154e981)

# Conflicts:
#	erpnext/patches.txt
(cherry picked from commit 1230127)

# Conflicts:
#	erpnext/patches.txt
Copy link
Contributor Author

mergify bot commented Mar 5, 2025

Cherry-pick of 17d415b has failed:

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

You are currently cherry-picking commit 17d415b105.
  (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/buying_controller.py
	modified:   erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
	new file:   erpnext/stock/doctype/purchase_receipt_item/patches/__init__.py
	new file:   erpnext/stock/doctype/purchase_receipt_item/patches/recalculate_amount_difference_field.py
	new file:   erpnext/stock/doctype/purchase_receipt_item/patches/rename_field_from_rate_difference_to_amount_difference.py
	modified:   erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
	both modified:   erpnext/patches.txt
	both modified:   erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json

Cherry-pick of 154e981 has failed:

On branch mergify/bp/version-15-hotfix/pr-45947
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 154e9813c4.
  (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/stock/doctype/purchase_receipt_item/patches/recalculate_amount_difference_field.py
	modified:   erpnext/stock/doctype/purchase_receipt_item/patches/rename_field_from_rate_difference_to_amount_difference.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/patches.txt

Cherry-pick of 1230127 has failed:

On branch mergify/bp/version-15-hotfix/pr-45947
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 1230127d24.
  (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:
	renamed:    erpnext/stock/doctype/purchase_receipt_item/patches/recalculate_amount_difference_field.py -> erpnext/patches/v15_0/recalculate_amount_difference_field.py
	renamed:    erpnext/stock/doctype/purchase_receipt_item/patches/rename_field_from_rate_difference_to_amount_difference.py -> erpnext/patches/v15_0/rename_field_from_rate_difference_to_amount_difference.py
	deleted:    erpnext/stock/doctype/purchase_receipt_item/patches/__init__.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/patches.txt

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 buying label Mar 5, 2025
@mihir-kandoi mihir-kandoi deleted the mergify/bp/version-15-hotfix/pr-45947 branch March 5, 2025 11:06
@mihir-kandoi mihir-kandoi restored the mergify/bp/version-15-hotfix/pr-45947 branch March 5, 2025 11:06
@mihir-kandoi mihir-kandoi reopened this Mar 5, 2025
@mihir-kandoi mihir-kandoi merged commit 8f278ab into version-15-hotfix Mar 5, 2025
16 of 21 checks passed
@mihir-kandoi mihir-kandoi deleted the mergify/bp/version-15-hotfix/pr-45947 branch March 5, 2025 11:28
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