-
Notifications
You must be signed in to change notification settings - Fork 7.1k
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(capitalization): debit cwip account instead of fixed asset account #42857
Merged
nabinhait
merged 10 commits into
frappe:develop
from
khushi8112:asset-capitalization-gl-entries
Aug 29, 2024
Merged
fix(capitalization): debit cwip account instead of fixed asset account #42857
nabinhait
merged 10 commits into
frappe:develop
from
khushi8112:asset-capitalization-gl-entries
Aug 29, 2024
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
…t-capitalization-gl-entries
…t-capitalization-gl-entries
nabinhait
requested changes
Aug 27, 2024
gl_entries_test = get_gl_entries("Asset Capitalization", asset_capitalization) | ||
|
||
# Return if GL entry's account matches the target fixed asset account | ||
if gl_entries_test and gl_entries_test[0].account == target_fixed_asset_account: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There are chances of debiting multiple accounts from asset capitalization. Hence, don't compare zero-th element to target_fixed_asset_account. Instead, get_gl_entries
should return gle for only target_fixed_asset_account.
nabinhait
approved these changes
Aug 29, 2024
mergify bot
pushed a commit
that referenced
this pull request
Aug 29, 2024
#42857) * fix(capitalization): debit cwip account instead of fixed asset account * fix: post entries for capitalized asset through background jobs * chore: run pre-commit * fix: correct GL entries posting for composite assets * fix(minor): resolve failing check * chore: update gl entry check logic * chore: handle none values (cherry picked from commit 5d99f17)
khushi8112
added a commit
that referenced
this pull request
Aug 29, 2024
…-42857 fix(capitalization): debit cwip account instead of fixed asset account (backport #42857)
frappe-pr-bot
pushed a commit
that referenced
this pull request
Sep 5, 2024
## [15.34.1](v15.34.0...v15.34.1) (2024-09-05) ### Bug Fixes * add the company in payment request bcz delete company transactions (backport [#42664](#42664)) ([#42982](#42982)) ([42e7725](42e7725)) * added app permission check for apps page ([a35ce12](a35ce12)) * adjust price insertion logic for internal suppliers/customers ([#42988](#42988)) ([daa75ee](daa75ee)) * auto reorder material request mail issue (backport [#43066](#43066)) ([#43068](#43068)) ([d2b2002](d2b2002)) * **capitalization:** debit cwip account instead of fixed asset account ([#42857](#42857)) ([f3c60ea](f3c60ea)) * company accounts setup_queries ([b99cdb5](b99cdb5)) * disabled batches showing in the list (backport [#43024](#43024)) ([#43069](#43069)) ([56dad7d](56dad7d)) * don't allow capitalizing only service item for new composite asset ([a833010](a833010)) * improve asset item matching logic ([3bb1867](3bb1867)) * indentation ([4d7c0c0](4d7c0c0)) * link Purchase Invoice and Receipt Items to Asset ([1121c66](1121c66)) * retain date filter when redirecting in Profit and Loss report ([f0e3fb4](f0e3fb4)) * typeerror on Payment Entry ([6d51d14](6d51d14)) * typerror on default_currency ([7d6984c](7d6984c)) * update develop_version in hooks ([6c8e0fd](6c8e0fd)) * validate component quantity according to BOM (backport [#43011](#43011)) ([#43014](#43014)) ([fee2255](fee2255))
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.
Problem:
The current asset capitalization process is incorrectly booking amounts directly into the Asset Account instead of the Capital Work in Progress (CWIP) account when a WIP composite asset is selected. Despite enable_cwip_accounting=1 being set and the CWIP account configured for the asset category, the system bypasses the CWIP account.