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: asset salvage_value_percentage #37302

Merged
merged 3 commits into from
Oct 3, 2023
Merged

feat: asset salvage_value_percentage #37302

merged 3 commits into from
Oct 3, 2023

Conversation

anandbaburajan
Copy link
Contributor

@anandbaburajan anandbaburajan commented Sep 29, 2023

Currently users need to calculate expected_value_after_useful_life manually if they want the value to be a percent of the asset's gross_purchase_amount. So I'm giving a salvage_value_percentage field in the finance books table where they can configure the percentage and the expected_value_after_useful_life would be automatically calculated.

Docs updated here: https://docs.erpnext.com/docs/user/manual/en/asset-asset#4-1-depreciation.

@anandbaburajan anandbaburajan added the backport version-14-hotfix backport to version 14 label Sep 29, 2023
@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Sep 29, 2023
@anandbaburajan anandbaburajan merged commit fed9484 into frappe:develop Oct 3, 2023
10 of 13 checks passed
mergify bot pushed a commit that referenced this pull request Oct 3, 2023
* feat: asset salvage_value_percentage

* chore: add missing parameter in get_item_details

* chore: change asset depr table colors

(cherry picked from commit fed9484)

# Conflicts:
#	erpnext/assets/doctype/asset/asset.js
#	erpnext/assets/doctype/asset_activity/asset_activity.json
#	erpnext/assets/doctype/asset_finance_book/asset_finance_book.json
anandbaburajan added a commit that referenced this pull request Oct 3, 2023
* feat: asset salvage_value_percentage (#37302)

* feat: asset salvage_value_percentage

* chore: add missing parameter in get_item_details

* chore: change asset depr table colors

(cherry picked from commit fed9484)

# Conflicts:
#	erpnext/assets/doctype/asset/asset.js
#	erpnext/assets/doctype/asset_activity/asset_activity.json
#	erpnext/assets/doctype/asset_finance_book/asset_finance_book.json

* chore: resolving conflicts

---------

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

### Bug Fixes

* add only float row values for total ([020aedb](020aedb))
* currency symbol in the Supplier Quotation Comparison report ([#37337](#37337)) ([82e8606](82e8606))
* Description field for the 'Ignore Available Stock' ([#37293](#37293)) ([7f1483a](7f1483a))
* do not consider submitted Work Orders in the Production Plan Res… ([#37343](#37343)) ([c3aeb2d](c3aeb2d))
* ignore user permissions for `Source Warehouse` (backport [#37313](#37313)) ([#37314](#37314)) ([04f0dfb](04f0dfb))
* incorrect qty for material request in Production Plan ([#37270](#37270)) ([8fe4a4d](8fe4a4d))
* Not unique table/alias: 'tabTask' (backport [#37285](#37285)) ([#37298](#37298)) ([95e0bf5](95e0bf5))
* party format in test ([28756bf](28756bf))
* PCV posting issues ([#37029](#37029)) ([92eabe3](92eabe3))
* process soa filter for multiselect ([4962b67](4962b67))
* query for multiselect filter ([6d7aa2a](6d7aa2a))
* set route filter values for AP ([49f0f1c](49f0f1c))
* set route filter values for AR ([2b30727](2b30727))
* summary report filters ([403ff69](403ff69))
* trial balance report freezes when adding filters (backport [#37264](#37264)) ([#37265](#37265)) ([6a8146b](6a8146b))
* Use default Cost Center of the Company for additional discount ([#37234](#37234)) ([e483b4a](e483b4a))
* validation message for valuation rate ([#37301](#37301)) ([643bb05](643bb05))

### Features

* asset salvage_value_percentage (backport [#37302](#37302)) ([#37334](#37334)) ([6daea6c](6daea6c))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 24, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport version-14-hotfix backport to version 14 needs-tests This PR needs automated unit-tests.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant