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

chore: removal of decapitalization feature (backport #45162) #45173

Merged
merged 2 commits into from
Jan 13, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 8, 2025

Removed Decapitalization feature from asset capitalization.
UI changes for Asset Capitalization DocType.


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

* chore: removal of decapitalization feature

* fix: rearrangement of asset capitalization doctype fields

(cherry picked from commit 7ea73d8)

# Conflicts:
#	erpnext/assets/doctype/asset_capitalization/asset_capitalization.json
Copy link
Contributor Author

mergify bot commented Jan 8, 2025

Cherry-pick of 7ea73d8 has failed:

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

You are currently cherry-picking commit 7ea73d8265.
  (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/sales_invoice/sales_invoice.py
	modified:   erpnext/assets/doctype/asset/asset.json
	modified:   erpnext/assets/doctype/asset/asset.py
	modified:   erpnext/assets/doctype/asset/asset_list.js
	modified:   erpnext/assets/doctype/asset/depreciation.py
	modified:   erpnext/assets/doctype/asset_capitalization/asset_capitalization.js
	modified:   erpnext/assets/doctype/asset_capitalization/asset_capitalization.py
	modified:   erpnext/assets/doctype/asset_capitalization/test_asset_capitalization.py
	modified:   erpnext/assets/report/fixed_asset_register/fixed_asset_register.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/assets/doctype/asset_capitalization/asset_capitalization.json

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 0665bc4 into version-15-hotfix Jan 13, 2025
11 checks passed
@nabinhait nabinhait deleted the mergify/bp/version-15-hotfix/pr-45162 branch January 13, 2025 06: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.

2 participants