Skip to content

Get prorata depreciation based on total days per year by khushi8112 [frappe] PR#41420

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

From: https://github.com/frappe/erpnext/pull/41420
Date: 2024-05-14 19:24:30+05:30

  • Merge pull request #41420 from khushi8112/get-prorata-depreciation-based-on-total-days-per-year
  • fix(minor): removed extra parameter
  • refactor: removed code duplicacies
  • fix(wip): depreciation calculation after asset value adjustment


Diagnostics

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

1 file reformatted, 1 file left unchanged


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

erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:701:22: F821 Undefined name `every_year_depr`
erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:717:5: F811 Redefinition of unused `get_shift_depr_amount` from line 689
Found 2 errors.


Suspicious merge commit detected: 16751ec93588d73185ec23e35a1970b8abd58137


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

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

# 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