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

Refactor: Rename purchase receipt amount field to purchase amount (backport #41089) #41461

Merged
merged 5 commits into from
May 14, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 14, 2024

Field "Purchase Receipt Amount" was getting the amount from purchase receipt amount or purchase invoice amount of the asset and it was misleading. So naming it "Purchase Amount" is better approach for better understanding.


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

“Khushi and others added 2 commits May 14, 2024 12:47
(cherry picked from commit 31841b4)

# Conflicts:
#	erpnext/assets/doctype/asset/asset.json
#	erpnext/assets/doctype/asset/asset.py
#	erpnext/patches.txt
Copy link
Contributor Author

mergify bot commented May 14, 2024

Cherry-pick of 31841b4 has failed:

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

You are currently cherry-picking commit 31841b4ab2.
  (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/accounts/doctype/purchase_invoice/purchase_invoice.py
	modified:   erpnext/assets/doctype/asset/asset.js
	modified:   erpnext/assets/doctype/asset/test_asset.py
	modified:   erpnext/assets/doctype/asset_capitalization/asset_capitalization.py
	modified:   erpnext/assets/doctype/asset_capitalization/test_asset_capitalization.py
	modified:   erpnext/controllers/buying_controller.py
	new file:   erpnext/patches/v15_0/rename_purchase_receipt_amount_to_purchase_amount.py
	modified:   erpnext/stock/doctype/purchase_receipt/purchase_receipt.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/assets/doctype/asset/asset.json
	both modified:   erpnext/assets/doctype/asset/asset.py
	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

@nabinhait nabinhait merged commit 230cff5 into version-15-hotfix May 14, 2024
10 of 11 checks passed
@nabinhait nabinhait deleted the mergify/bp/version-15-hotfix/pr-41089 branch May 14, 2024 14:28
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.23.2 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 31, 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