-
Notifications
You must be signed in to change notification settings - Fork 7.3k
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: composite WIP asset #37352
Merged
anandbaburajan
merged 1 commit into
frappe:version-14-hotfix
from
anandbaburajan:asset_cap_wip
Oct 4, 2023
Merged
feat: composite WIP asset #37352
anandbaburajan
merged 1 commit into
frappe:version-14-hotfix
from
anandbaburajan:asset_cap_wip
Oct 4, 2023
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
anandbaburajan
requested review from
rohitwaghchaure,
s-aga-r,
deepeshgarg007 and
ruthra-kumar
as code owners
October 3, 2023 19:43
@mergify copy develop |
✅ Pull request copies have been created
|
anandbaburajan
merged commit Oct 4, 2023
0ecd7d2
into
frappe:version-14-hotfix
8 of 12 checks passed
anandbaburajan
added a commit
that referenced
this pull request
Oct 4, 2023
* feat: wip composite asset (cherry picked from commit 4907e7a) # Conflicts: # erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json # erpnext/assets/doctype/asset/asset.json # erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json * chore: resolving conflicts --------- Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
@mergify backport version-14 |
✅ Backports have been created
|
mergify bot
pushed a commit
that referenced
this pull request
Oct 4, 2023
feat: wip composite asset (cherry picked from commit 0ecd7d2)
anandbaburajan
added a commit
that referenced
this pull request
Oct 4, 2023
frappe-pr-bot
pushed a commit
that referenced
this pull request
Oct 12, 2023
# [14.44.0](v14.43.1...v14.44.0) (2023-10-12) ### Bug Fixes * added validation for the batch on stock reco ([#37174](#37174)) ([4c337a6](4c337a6)) * ageing summary in AR ([15d2024](15d2024)) * allocate amt for payment term invoices ([b22ac13](b22ac13)) * call validate before setting repost flag ([bec3e8e](bec3e8e)) * do not run bg job for single doc ([4123e7b](4123e7b)) * **Employee:** enable `no_copy` for `relieving_date` (backport [#37344](#37344)) ([#37358](#37358)) ([2b38b78](2b38b78)) * exception on exporting errored rows ([e58b3b1](e58b3b1)) * fetch company details for Lead based quotation ([c1d40a6](c1d40a6)) * fetch dependent task subject and project (backport [#37401](#37401)) ([#37421](#37421)) ([0aad942](0aad942)) * ignore cancelled gle in voucher-wise balance report ([#36417](#36417)) ([ee1255a](ee1255a)) * incorrect status of the returned purchase receipt ([#37300](#37300)) ([63f4573](63f4573)) * linting issues ([6c8a65e](6c8a65e)) * negative valuation rate in PR return ([#37424](#37424)) ([26ad688](26ad688)) * payment request rounding in multi-currency and on status update ([eed5863](eed5863)) * production plan reserved qty incorrect calculation (backport [#37400](#37400)) ([#37458](#37458)) ([573b159](573b159)) * split inv allocated amt on server side ([06b0477](06b0477)) * typo in doctype name and qb ([606c99e](606c99e)) * **ux:** allow MR to Stop until fully received (backport [#37452](#37452)) ([#37456](#37456)) ([fb0b426](fb0b426)) * validation for si ([3dc68e3](3dc68e3)) ### Features * add repost btn in invoice ([cde848d](cde848d)) * allow on submit fields ([f5245f6](f5245f6)) * allow repost for pi ([2d13dda](2d13dda)) * composite WIP asset ([#37352](#37352)) ([0ecd7d2](0ecd7d2)) * disable currency exchange api. ([#33593](#33593)) ([1ca0516](1ca0516)) * filter on voucher no ([cb35218](cb35218)) * introduce unreconcile doctype ([ae8355c](ae8355c)) * UI for unreconcile ([9531a45](9531a45)) * unreconcile support for journal entry ([cd2d335](cd2d335)) * validate negative stock for inventory dimension ([#37373](#37373)) ([1480aca](1480aca))
🎉 This PR is included in version 14.44.0 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Imagine you want to create a
Computer
asset made from multiple different items likeMonitor
,Keyboard
, etc., and you have huge number of items to keep track of. Now you can create a composite WIP asset by checkingis_composite_asset
, then tag that asset to items as they come in theWIP Composite Asset
field of PIs/PRs, and once all the items are available, you can use theAsset Capitalization
feature to capitalize the asset.Docs: https://docs.erpnext.com/docs/user/manual/en/asset-asset#2-3-creating-composite-assets