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: composite WIP asset #37352

Merged
merged 1 commit into from
Oct 4, 2023
Merged

feat: composite WIP asset #37352

merged 1 commit into from
Oct 4, 2023

Conversation

anandbaburajan
Copy link
Contributor

@anandbaburajan anandbaburajan commented Oct 3, 2023

Imagine you want to create a Computer asset made from multiple different items like Monitor, Keyboard, etc., and you have huge number of items to keep track of. Now you can create a composite WIP asset by checking is_composite_asset, then tag that asset to items as they come in the WIP Composite Asset field of PIs/PRs, and once all the items are available, you can use the Asset Capitalization feature to capitalize the asset.

image

image

Docs: https://docs.erpnext.com/docs/user/manual/en/asset-asset#2-3-creating-composite-assets

@anandbaburajan
Copy link
Contributor Author

@mergify copy develop

@mergify
Copy link
Contributor

mergify bot commented Oct 3, 2023

copy develop

✅ Pull request copies have been created

@anandbaburajan anandbaburajan merged commit 0ecd7d2 into frappe:version-14-hotfix Oct 4, 2023
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>
@anandbaburajan
Copy link
Contributor Author

@mergify backport version-14

@mergify
Copy link
Contributor

mergify bot commented Oct 4, 2023

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
feat: composite WIP asset (#37352)

feat: wip composite asset
(cherry picked from commit 0ecd7d2)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
frappe-pr-bot pushed a commit that referenced this pull request Oct 4, 2023
# [14.43.0](v14.42.0...v14.43.0) (2023-10-04)

### Features

* composite WIP asset (backport [#37352](#37352)) ([#37360](#37360)) ([6947686](6947686))
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))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.44.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 Jan 22, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants