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

feat: work in progress status for asset (backport #45066) #45149

Merged
merged 4 commits into from
Jan 8, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 7, 2025

The asset status will now display "Work In Progress" for assets that are not yet ready for use and are still under development.

Screenshot 2025-01-06 at 2 26 08 PM

no-docs


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

* feat: work in progress status for asset

* fix: test case correction

* fix(patch): added patch to update status of assets

* fix: updated tests

(cherry picked from commit 6850019)

# Conflicts:
#	erpnext/assets/doctype/asset/asset.json
#	erpnext/patches.txt
@mergify mergify bot requested a review from deepeshgarg007 as a code owner January 7, 2025 18:14
@mergify mergify bot added the conflicts label Jan 7, 2025
@mergify mergify bot requested a review from khushi8112 as a code owner January 7, 2025 18:14
Copy link
Contributor Author

mergify bot commented Jan 7, 2025

Cherry-pick of 6850019 has failed:

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

You are currently cherry-picking commit 6850019649.
  (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/assets/doctype/asset/asset.py
	modified:   erpnext/assets/doctype/asset/asset_list.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/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py
	new file:   erpnext/patches/v15_0/update_asset_status_to_work_in_progress.py

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

@khushi8112 khushi8112 merged commit 9e60d1a into version-15-hotfix Jan 8, 2025
11 checks passed
@khushi8112 khushi8112 deleted the mergify/bp/version-15-hotfix/pr-45066 branch January 8, 2025 06:15
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