Skip to content

Depreciation based on daily prorata by khushi8112 [frappe] PR#41235

Bot Dokos requested to merge ft-pr-41235 into develop

From: https://github.com/frappe/erpnext/pull/41235
Date: 2024-05-15 01:10:54+05:30

  • fix: removed same named function
  • refactor: code optimization
  • fix: pro rata based depreciation with opening accumulated depreciation
  • test: made minor change in existing test
  • fix: incorrect total days calculation
  • fix: daily prorata based depreciation bug in wdv method
  • fix(wip): daily depreciation bug


Diagnostics

pre-commit failed for source commit: f337392f3ee94e7d2e27c9b6b2bfd8d5a2dcf1d5
Format Python code.......................................................Failed
- hook id: ruff-format
- files were modified by this hook

1 file reformatted


pre-commit failed for source commit: b8a98a273b965a25a697944762fad0cd34ca1598
Run ruff linter and apply fixes..........................................Failed
- hook id: ruff
- exit code: 1

erpnext/assets/doctype/asset_depreciation_schedule/test_asset_depreciation_schedule.py:68:5: F821 Undefined name `cstr`
erpnext/assets/doctype/asset_depreciation_schedule/test_asset_depreciation_schedule.py:69:13: F821 Undefined name `get_depr_schedule`
Found 2 errors.

Format Python code.......................................................Failed
- hook id: ruff-format
- files were modified by this hook

1 file reformatted, 2 files left unchanged


pre-commit failed for source commit: c0c8c1bb02815e084931a450326fa1cd4f0baf0d
Run ruff linter and apply fixes..........................................Failed
- hook id: ruff
- exit code: 1

erpnext/assets/doctype/asset_depreciation_schedule/test_asset_depreciation_schedule.py:68:5: F821 Undefined name `cstr`
erpnext/assets/doctype/asset_depreciation_schedule/test_asset_depreciation_schedule.py:69:13: F821 Undefined name `get_depr_schedule`
erpnext/assets/doctype/asset_depreciation_schedule/test_asset_depreciation_schedule.py:99:5: F821 Undefined name `cstr`
erpnext/assets/doctype/asset_depreciation_schedule/test_asset_depreciation_schedule.py:100:13: F821 Undefined name `get_depr_schedule`
erpnext/assets/doctype/asset_depreciation_schedule/test_asset_depreciation_schedule.py:129:5: F821 Undefined name `cstr`
erpnext/assets/doctype/asset_depreciation_schedule/test_asset_depreciation_schedule.py:130:13: F821 Undefined name `get_depr_schedule`
erpnext/assets/doctype/asset_depreciation_schedule/test_asset_depreciation_schedule.py:157:5: F821 Undefined name `cstr`
erpnext/assets/doctype/asset_depreciation_schedule/test_asset_depreciation_schedule.py:158:13: F821 Undefined name `get_depr_schedule`
Found 8 errors.


Checkout instructions 
# Checkout locally
git fetch upstream
git switch ft-pr-41235

# Alternatively, re-take the changes
git switch develop
ft take ft-pr-41235

# Make changes then rebase
git rebase -i develop

# Fix or ignore conflicts
git checkout --theirs .
git rebase --continue

# Force-push changes
git push --force-with-lease

Merge request reports