-
Notifications
You must be signed in to change notification settings - Fork 7.4k
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: shift depreciation for assets #38327
Merged
Merged
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
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## develop #38327 +/- ##
===========================================
- Coverage 67.23% 67.08% -0.15%
===========================================
Files 758 760 +2
Lines 60629 60769 +140
===========================================
+ Hits 40765 40768 +3
- Misses 19864 20001 +137
|
anandbaburajan
added a commit
that referenced
this pull request
Nov 29, 2023
deepeshgarg007
added a commit
that referenced
this pull request
Nov 29, 2023
* feat: shift depreciation for assets [v14] [backport of #38327] (#38404) feat: shift depreciation for assets * fix: no fstring in translation (#38381) fix: no fstring in translation (#38381) (cherry picked from commit 8f00481) Co-authored-by: Raffael Meyer <[email protected]> * fix: debit credit mismatch in multi-currecy asset purchase receipt (#38342) fix: debit credit mismatch in multi-currecy asset purchase receipt (#38342) * fix: Debit credit mimatch in multicurrecy asset purchase receipt * test: multi currency purchase receipt * chore: update init files * test: roolback (cherry picked from commit add238c) Co-authored-by: Deepesh Garg <[email protected]> * fix(regional): use net figures for sales calc (#38260) fix(regional): use net figures for sales calc (#38260) (cherry picked from commit 663bb87) Co-authored-by: Dany Robert <[email protected]> --------- Co-authored-by: Anand Baburajan <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Raffael Meyer <[email protected]> Co-authored-by: Dany Robert <[email protected]>
mergify bot
pushed a commit
that referenced
this pull request
Nov 29, 2023
* feat: shift depreciation for assets * chore: create new asset depr schedule on shift change * refactor: move create_depr_schedule to after_insert * fix: args in get_depreciation_amount test * refactor: rename shift adjustment to shift allocation * chore: asset shift factor doctype and auto allocate shift diff * chore: use check instead of depr type, and add tests * chore: make linter happy * chore: give permissions to accounts users (cherry picked from commit fe5fc5b)
anandbaburajan
added a commit
that referenced
this pull request
Nov 29, 2023
feat: shift depreciation for assets (#38327) * feat: shift depreciation for assets * chore: create new asset depr schedule on shift change * refactor: move create_depr_schedule to after_insert * fix: args in get_depreciation_amount test * refactor: rename shift adjustment to shift allocation * chore: asset shift factor doctype and auto allocate shift diff * chore: use check instead of depr type, and add tests * chore: make linter happy * chore: give permissions to accounts users (cherry picked from commit fe5fc5b) Co-authored-by: Anand Baburajan <[email protected]>
frappe-pr-bot
pushed a commit
that referenced
this pull request
Dec 5, 2023
# [15.5.0](v15.4.0...v15.5.0) (2023-12-05) ### Bug Fixes * `AttributeError` while saving Purchase Invoice (backport [#38482](#38482)) ([#38490](#38490)) ([f6c48e8](f6c48e8)) * `OperationalError` while selecting Serial No in `Warranty Claim` (backport [#38394](#38394)) ([#38414](#38414)) ([80afeca](80afeca)) * Add missing french translations ([#38368](#38368)) ([b5c89ec](b5c89ec)) * better overlap logic for job card (backport [#38432](#38432)) ([#38522](#38522)) ([2a9e843](2a9e843)) * consider the `Valuation Method` while picking incorrect SLE (backport [#38592](#38592)) ([#38595](#38595)) ([9d45bbd](9d45bbd)) * debit credit mismatch in multi-currecy asset purchase receipt ([#38342](#38342)) ([b9f26ae](b9f26ae)) * don't consider cancelled entries ([#38401](#38401)) ([0a29dbe](0a29dbe)) * don't show non-stock items in Stock Analytics report (backport [#38543](#38543)) ([#38545](#38545)) ([282a5b2](282a5b2)) * don't update previous doc on rate change (backport [#38493](#38493)) ([#38524](#38524)) ([0aa96f7](0aa96f7)) * exclude `invoice_doctypes` from party advance ([927538f](927538f)) * exploded items in Subcontracting Receipt (backport [#38441](#38441)) ([#38445](#38445)) ([e066698](e066698)) * german translations for Lost Quotations (backport [#38435](#38435)) ([#38516](#38516)) ([33c59a2](33c59a2)) * get dynamic link with parenttype contact ([cb9589b](cb9589b)) * incorrect customer outstanding amount ([#38475](#38475)) ([98fe89a](98fe89a)) * incorrect material request quantity in Production Plan (backport [#38566](#38566)) ([#38579](#38579)) ([145ed3a](145ed3a)) * incorrect ordered qty for Subcontracting Order ([#38415](#38415)) ([71fe2bc](71fe2bc)) * incorrect requested quantity for the subcontracting order ([abe3e41](abe3e41)) * incorrectly treating normal payment as advance ([#38437](#38437)) ([246dd74](246dd74)) * item group filter in sales person wise report ([602f6ca](602f6ca)) * make create button translatable ([#38165](#38165)) ([95f9cc9](95f9cc9)) * **regional:** use net figures for sales calc ([#38260](#38260)) ([4a243ce](4a243ce)) * remove hardcoded, implicit rounding loss allowance ([4baf796](4baf796)) * scan for serial or batch in bundle (backport [#38534](#38534)) ([#38552](#38552)) ([88d2a8d](88d2a8d)) * set cwip account before asset tests ([de7e1ab](de7e1ab)) * show item name as title instead of item group in BOM (backport [#38478](#38478)) ([#38481](#38481)) ([8e57862](8e57862)) * show party instead of party name where naming series not set ([f120dc5](f120dc5)) * sql error while filtering on finance book in GL ([3779943](3779943)) * **test:** use correct account type for testing ([8b6eb35](8b6eb35)) * unset discount amount based on coupon code ([0e50e77](0e50e77)) * use `docstatus` instead of `status` (backport [#38439](#38439)) ([#38443](#38443)) ([a50e872](a50e872)) * use predefined onload property `load_after_mapping` ([#38209](#38209)) ([4a558b7](4a558b7)) * **ux:** make valuation field read only when it can't be modified (backport [#38450](#38450)) ([#38464](#38464)) ([2d9ba88](2d9ba88)) * validation error has not throw for the batch (backport [#38494](#38494)) ([#38502](#38502)) ([c797c53](c797c53)) ### Features * `Company` filter in `Stock Ledger Variance` report (backport [#38553](#38553)) ([#38574](#38574)) ([02d7dd8](02d7dd8)) * add customer group filter in sales register ([#38365](#38365)) ([185b715](185b715)) * auto create PR on SCR submission (backport [#38290](#38290)) ([#38428](#38428)) ([7005d51](7005d51)) * enable automatic type annotations (backport [#38452](#38452)) ([#38454](#38454)) ([5e6a4d2](5e6a4d2)) * shift depreciation for assets (backport [#38327](#38327)) ([#38417](#38417)) ([12ad1ec](12ad1ec))
frappe-pr-bot
pushed a commit
that referenced
this pull request
Dec 5, 2023
# [14.53.0](v14.52.1...v14.53.0) (2023-12-05) ### Bug Fixes * `OperationalError` while selecting Serial No in `Warranty Claim` (backport [#38394](#38394)) ([#38413](#38413)) ([49296cd](49296cd)) * better overlap logic for job card (backport [#38432](#38432)) ([#38521](#38521)) ([6db63c9](6db63c9)) * consider the `Valuation Method` while picking incorrect SLE (backport [#38592](#38592)) ([#38594](#38594)) ([01b2a1f](01b2a1f)) * debit credit mismatch in multi-currecy asset purchase receipt ([#38342](#38342)) ([fd6a23c](fd6a23c)) * don't consider cancelled entries ([#38401](#38401)) ([9345334](9345334)) * don't show non-stock items in Stock Analytics report (backport [#38543](#38543)) ([#38544](#38544)) ([2e333e6](2e333e6)) * don't update previous doc on rate change (backport [#38493](#38493)) ([#38523](#38523)) ([b88c7d6](b88c7d6)) * exclude `invoice_doctypes` from party advance ([1042d4c](1042d4c)) * exploded items in Subcontracting Receipt (backport [#38441](#38441)) ([#38444](#38444)) ([2908d96](2908d96)) * get dynamic link with parenttype contact ([12d3cda](12d3cda)) * incorrect customer outstanding amount ([#38475](#38475)) ([c07723d](c07723d)) * incorrect material request quantity in Production Plan (backport [#38566](#38566)) ([#38578](#38578)) ([70965ef](70965ef)) * incorrect ordered qty for Subcontracting Order ([#38415](#38415)) ([8e37087](8e37087)) * incorrect requested quantity for the subcontracting order (backport [#38455](#38455)) ([#38471](#38471)) ([497049b](497049b)) * item group filter in sales person wise report ([eee9062](eee9062)) * make create button translatable ([#38165](#38165)) ([c71b31e](c71b31e)) * no fstring in translation ([#38381](#38381)) ([cec2574](cec2574)) * **pe:** show split alert only on splitting ([8d6d74c](8d6d74c)) * **regional:** use net figures for sales calc ([#38260](#38260)) ([d337533](d337533)) * remove hardcoded, implicit rounding loss allowance ([419943a](419943a)) * set cwip account before asset tests ([ecde1d5](ecde1d5)) * show item name as title instead of item group in BOM (backport [#38478](#38478)) ([#38480](#38480)) ([0df52d2](0df52d2)) * SO ordered qty on PO item removal ([#38378](#38378)) ([b7fe163](b7fe163)) * sql error while filtering on finance book in GL ([25ec1fc](25ec1fc)) * unset discount amount based on coupon code ([7fa97fa](7fa97fa)) * use `docstatus` instead of `status` (backport [#38439](#38439)) ([#38442](#38442)) ([2dc4b02](2dc4b02)) * use predefined onload property `load_after_mapping` (backport [#38209](#38209)) ([#38518](#38518)) ([9f23b7e](9f23b7e)) * **ux:** make valuation field read only when it can't be modified (backport [#38450](#38450)) ([#38463](#38463)) ([bec7fb5](bec7fb5)) * validate finance_books table length in asset ([#38584](#38584)) ([14b908f](14b908f)) ### Features * `Company` filter in `Stock Ledger Variance` report (backport [#38553](#38553)) ([#38573](#38573)) ([6c89f35](6c89f35)) * shift depreciation for assets [v14] [backport of [#38327](#38327)] ([#38404](#38404)) ([d8c3935](d8c3935))
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.
Checking the "Depreciate based on shifts" checkbox for a finance book row in an asset lets users define the number of shifts the asset would run in a period in order to depreciate it accordingly. Users can define the shift names with their shift factors in the Asset Shift Factor doctype (for example: "half": 0.5, "single": 1, "double": 1.5 and "triple": 2) and set a default. Later if they want to change the shifts of an asset for a particular period, they can do so using the new Asset Shift Allocation doctype, and the remaining shifts are automatically adjusted.
Docs: https://docs.erpnext.com/docs/user/manual/en/asset-shift-allocation