-
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
fix: allow fully depreciated existing assets #36378
Merged
anandbaburajan
merged 2 commits into
frappe:version-14-hotfix
from
anandbaburajan:fully-depr-asset
Aug 1, 2023
Merged
fix: allow fully depreciated existing assets #36378
anandbaburajan
merged 2 commits into
frappe:version-14-hotfix
from
anandbaburajan:fully-depr-asset
Aug 1, 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
@mergify copy develop |
✅ Pull request copies have been created
|
anandbaburajan
added a commit
that referenced
this pull request
Aug 1, 2023
* fix: allow fully depreciated existing assets (cherry picked from commit 9489cba) # Conflicts: # erpnext/assets/doctype/asset/asset.json # erpnext/assets/doctype/asset/depreciation.py * chore: fix conflicts in asset.json * chore: fix conflicts in depreciation.py --------- Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
frappe-pr-bot
pushed a commit
that referenced
this pull request
Aug 1, 2023
# [14.33.0](v14.32.1...v14.33.0) (2023-08-01) ### Bug Fixes * allow fully depreciated existing assets ([#36378](#36378)) ([43b85c5](43b85c5)) * change fieldtype from Currency to Float for the valuation rate in the stock report ([93bd4c7](93bd4c7)) * cost center filter for fetching payments ([c9daa85](c9daa85)) * Defined "Open" Status as default (backport [#36421](#36421)) ([#36424](#36424)) ([33a9477](33a9477)) * filter by cost center in trial balance ([02428b4](02428b4)) * german translations ([9c8e2a3](9c8e2a3)) * GL Entries should not be splitted based on cost center allocation in PCV ([ade13e6](ade13e6)) * group item reorder by (warehouse, material_request_type) (backport [#35818](#35818)) ([#36425](#36425)) ([516191b](516191b)) * Ignore account closing balance for financial statement ([800417e](800417e)) * in payment_entry 'Unallocated Amount' cal is broken ([#36369](#36369)) ([cd3b85c](cd3b85c)) * incorrect `idx` on JE's after reconciliation ([80eb875](80eb875)) * incorrect qty set in the serial no picker ([57b19a5](57b19a5)) * incorrect usage `get_cached_value` on single doctypes ([8f72a68](8f72a68)) * **Item Group:** allow root deletion ([1a6be5e](1a6be5e)) * job card suggest holiday as start date (backport [#35958](#35958)) ([#36423](#36423)) ([29ddd26](29ddd26)) * Job Card validation fixed when displaying total completed quantity ([7b3bcd3](7b3bcd3)) * multiple issues related to Production Plan (backport [#36377](#36377)) ([#36381](#36381)) ([a799e1b](a799e1b)) * not able to make material request (backport [#36416](#36416)) ([#36426](#36426)) ([99e7406](99e7406)) * only publish repost progress to doc subscriber (backport [#36400](#36400)) ([#36402](#36402)) ([32bdb7c](32bdb7c)) * overallocation validation misfire on normal invoices ([#36349](#36349)) ([09af485](09af485)) * paid_amount when the group is mode of payment ([50ef358](50ef358)) * process_owner is not link User (backport [#36420](#36420)) ([#36422](#36422)) ([289dc36](289dc36)) * removed "fetch_from" (backport [#36365](#36365)) ([#36386](#36386)) ([6d051f5](6d051f5)) * root type in account map for balance sheet ([#36303](#36303)) ([5b56296](5b56296)) * show invoices name instead of object address ([e802f0c](e802f0c)) * show tds & tcs separately ([619b0fe](619b0fe)) * test with None conditon in PE ([479cab0](479cab0)) * typo in loyalty program throw message ([#36432](#36432)) ([782a4d1](782a4d1)) ### Features * add party type filter ([32fea64](32fea64)) ### Performance Improvements * avoid full table scan in sle count check ([#36428](#36428)) ([04f9915](04f9915)) * move project status reminder to hourly (backport [#36372](#36372)) ([#36373](#36373)) ([4ac60cd](4ac60cd)) * use `LEFT JOIN` instead of `NOT EXISTS` (backport [#36221](#36221)) ([#36383](#36383)) ([26a0b3b](26a0b3b))
🎉 This PR is included in version 14.33.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.
Is Fully Depreciated
checkbox for Assets since the flow for adding fully depreciated existing assets was confusing before -- some users checked theCalculate Depreciation
checkbox even for fully depreciated existing assets.