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: service item capitalization (backport #42188) #42360

Merged
merged 3 commits into from
Jul 16, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 16, 2024

Allow Capitalize Only Service Item

  • This PR includes a fix that allows for the capitalization of service items independently, without requiring either a consumed item or consumed stock item to be capitalized alongside the service item.

Removed Capitalized In field from aseet doc

  • Required for allowing multiple capitalization against a composite asset

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

* feat: capitalize with service expenses only

* chore: added test

* refactor: removed Capitalized In field from asset doc

(cherry picked from commit 81e0b96)

# Conflicts:
#	erpnext/assets/doctype/asset/asset.py
@mergify mergify bot added the conflicts label Jul 16, 2024
@mergify mergify bot requested a review from deepeshgarg007 as a code owner July 16, 2024 12:16
Copy link
Contributor Author

mergify bot commented Jul 16, 2024

Cherry-pick of 81e0b96 has failed:

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

You are currently cherry-picking commit 81e0b96c30.
  (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.js
	modified:   erpnext/assets/doctype/asset/asset.json
	modified:   erpnext/assets/doctype/asset_capitalization/asset_capitalization.py
	modified:   erpnext/assets/doctype/asset_capitalization/test_asset_capitalization.py
	deleted:    erpnext/patches/v15_0/remove_cancelled_asset_capitalization_from_asset.py

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

@khushi8112 khushi8112 merged commit 55dc157 into version-15-hotfix Jul 16, 2024
11 checks passed
@khushi8112 khushi8112 deleted the mergify/bp/version-15-hotfix/pr-42188 branch July 16, 2024 20:21
@frappe-pr-bot
Copy link
Collaborator

🎉 This issue has been resolved in version 15.30.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

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

2 participants