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: last purchase rate for purchase invoice (backport #43448) #43452

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 30, 2024

  1. Create the Purchase Invoice with rate as 200, the last purchase rate in the item master set as 200
  2. Create the Purchase Invoice with rate as 300, the last purchase rate in the item master set as 300
  3. Cancel the second purchase invoice, the last purchase rate in the item master should be 200 but it's showing the rate as 300

This is an automatic backport of pull request #43448 done by [Mergify](https://mergify.com).

(cherry picked from commit fb9d106)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
Copy link
Contributor Author

mergify bot commented Sep 30, 2024

Cherry-pick of fb9d106 has failed:

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

You are currently cherry-picking commit fb9d106633.
  (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/public/js/controllers/transaction.js
	modified:   erpnext/stock/doctype/item/item.py

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

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

@rohitwaghchaure rohitwaghchaure merged commit ee2c8c8 into version-15-hotfix Oct 1, 2024
11 checks passed
@rohitwaghchaure rohitwaghchaure deleted the mergify/bp/version-15-hotfix/pr-43448 branch October 1, 2024 07:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant