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.

Sign up for GitHub

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

Jump to bottom

fix: value of depreciable assets not updating after manual depr entry [v14] #35010

Merged
merged 7 commits into from
Apr 25, 2023
Merged

fix: value of depreciable assets not updating after manual depr entry [v14] #35010

merged 7 commits into from
Apr 25, 2023

Conversation

anandbaburajan
Copy link
Contributor

@anandbaburajan anandbaburajan commented Apr 24, 2023 •
edited
Loading

  • A user had to create a depreciation entry manually for an asset when he later realised that the amounts in the asset's depreciation schedule weren't matching with the auditor's book. But since our system didn't handle the case of manual depreciation entries for depreciable assets, the value of the asset wasn't updated. So I fixed that.
  • The Asset Depreciations and Balances report didn't reflect the depreciation values for manual depreciation entries, so fixed that as well.
  • The system required users to cancel the asset and the asset movement when they tried to cancel a particular depreciation entry, so added those doctypes to journal entry doctype's ignore_doctypes_on_cancel_all.
  • Added validation to make sure that depreciation entries have voucher type set to 'Depreciation Entry'.

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Apr 24, 2023
@anandbaburajan anandbaburajan changed the title fix: value of depreciable assets not updating after manual depr entry fix: value of depreciable assets not updating after manual depr entry [v14] Apr 24, 2023
@anandbaburajan anandbaburajan merged commit 3c75e55 into frappe:version-14-hotfix Apr 25, 2023
8 of 9 checks passed
mergify bot pushed a commit that referenced this pull request Apr 25, 2023
@anandbaburajan @mergify
fix: value of depreciable assets not updating after manual depr entry…
47d0ea5 
… [v14] (#35010)

* fix: update value of asset with calc_depr on after manual depr entry

* fix: value of asset with calc_depr on after manual depr entry not reflecting in asset_depr_and_bal report

* chore: add validation for depr journal entry

* test: manual_depr_for_depreciable_asset and manual_depr_w_incorrect_jv_voucher_type

* chore: unlink depreciable asset from manual depr entry

(cherry picked from commit 3c75e55)

# Conflicts:
#	erpnext/accounts/doctype/journal_entry/journal_entry.js
@mergify mergify bot mentioned this pull request Apr 25, 2023
Merged
anandbaburajan added a commit that referenced this pull request Apr 25, 2023
@mergify @anandbaburajan
fix: value of depreciable assets not updating after manual depr entry…
9087ac0 
… [v14] (backport #35010) (#35029)

* fix: value of depreciable assets not updating after manual depr entry [v14] (#35010)

* fix: update value of asset with calc_depr on after manual depr entry

* fix: value of asset with calc_depr on after manual depr entry not reflecting in asset_depr_and_bal report

* chore: add validation for depr journal entry

* test: manual_depr_for_depreciable_asset and manual_depr_w_incorrect_jv_voucher_type

* chore: unlink depreciable asset from manual depr entry

(cherry picked from commit 3c75e55)

# Conflicts:
#	erpnext/accounts/doctype/journal_entry/journal_entry.js

* chore: fixed conflicts

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
frappe-pr-bot pushed a commit that referenced this pull request Apr 25, 2023
@frappe-bot
chore(release): Bumped to Version 13.49.14
1d6917f 
## [13.49.14](v13.49.13...v13.49.14) (2023-04-25)

### Bug Fixes

* `PermissionError` in Work Order ([5680045](5680045))
* Advance payment against payment terms ([#34872](#34872)) ([d215a85](d215a85))
* internal Purchase Receipt GL Entries ([b73422e](b73422e))
* Payment entry with TDS in bank reco statement ([#34961](#34961)) ([5f28b1d](5f28b1d))
* Payment Request flow fixes from Order to Payment Entry ([#33350](#33350)) ([d5a80b5](d5a80b5))
* SLA permissions ([#34981](#34981)) ([c1187be](c1187be))
* **test:** `test_backdated_stock_reco_cancellation_future_negative_stock` ([d010b04](d010b04))
* Unable to allocate advance against invoice ([#35007](#35007)) ([61a3121](61a3121))
* use filter_by_finance_book instead of only_depreciable_assets in fixed asset register (backport [#35031](#35031)) ([#35036](#35036)) ([be2095a](be2095a))
* validation for internal transfer entry ([91b5a33](91b5a33))
* value of depreciable assets not updating after manual depr entry [v14] (backport [#35010](#35010)) ([#35029](#35029)) ([9087ac0](9087ac0))
* wrong qty of remaining work orders to be created when using "Create" > "Work Order" ([#34726](#34726)) ([189b020](189b020))
frappe-pr-bot pushed a commit that referenced this pull request Apr 25, 2023
@frappe-bot
chore(release): Bumped to Version 14.23.0
85f3a5d 
# [14.23.0](v14.22.3...v14.23.0) (2023-04-25)

### Bug Fixes

* `PermissionError` in Work Order ([a3568c1](a3568c1))
* Add company field to lower deduction certificate ([#34914](#34914)) ([d732083](d732083))
* add item-code filter for SCR supplied-items batch-no ([7c4f83e](7c4f83e))
* add limit for get_next_stock_reco ([#34937](#34937)) ([7131ff2](7131ff2))
* added validation for extra job card ([a5fde5d](a5fde5d))
* batch qty conversion factor issue fixed in pos transaction ([#34917](#34917)) ([56ef0ba](56ef0ba))
* broken 'set exchange gain/loss' btn in payment entry ([#34940](#34940)) ([00968ba](00968ba))
* Bulk Payment Entry from PO/SO ([#34942](#34942)) ([878d747](878d747))
* click handler should not attempt indexed access of empty array ([#35013](#35013)) ([06f204a](06f204a))
* Common party JV cost center ([#35008](#35008)) ([693007a](693007a))
* duplicate reposting entries of same voucher ([aeac43c](aeac43c))
* FEC report for France accountancy  ([#34781](#34781)) ([6aabab2](6aabab2))
* filtering via batch no ([#34951](#34951)) ([3b23fc1](3b23fc1)), closes [#34950](#34950)
* Incorrect difference value in Stock and Account Value Comparison report ([e7ca833](e7ca833))
* incorrect OR condition causing timeout error ([c020789](c020789))
* internal Purchase Receipt GL Entries ([f7e436f](f7e436f))
* item not showing in the BOM ([28cd79a](28cd79a))
* pass reference_doctype in link queries (backport [#35038](#35038)) ([#35039](#35039)) ([5cc3978](5cc3978))
* Payment entry with TDS in bank reco statement ([#34961](#34961)) ([f43ea0d](f43ea0d))
* per_billed condition for Payment Entry ([#34969](#34969)) ([f9f42c7](f9f42c7))
* process_loss_percentage in BOM ([4418862](4418862))
* removed depends on for the Employee Detail section ([9d17d3f](9d17d3f))
* respect title_field from doctype to bulk transactions ([#34928](#34928)) ([29aa4a0](29aa4a0))
* set `frappe.flags.company` to call regional code accurately ([789dfd6](789dfd6))
* simplify `erpnext.get_region` ([87595bd](87595bd))
* SLA permissions (backport [#34981](#34981)) ([#34986](#34986)) ([83a1b83](83a1b83))
* stock entry type issue ([33a1608](33a1608))
* **test:** `test_backdated_stock_reco_cancellation_future_negative_stock` ([2ad157b](2ad157b))
* **test:** `test_internal_pr_gl_entries` ([7740ceb](7740ceb))
* Unable to allocate advance against invoice ([#35007](#35007)) ([5045ad6](5045ad6))
* use `functools.wraps` to preserve doc signature ([2ec18eb](2ec18eb))
* use CombineDatetime instead of Timestamp in QB queries ([55da91c](55da91c))
* use filter_by_finance_book instead of only_depreciable_assets in fixed asset register (backport [#35031](#35031)) ([#35035](#35035)) ([5630e81](5630e81))
* Use set instead of db_set as it is called from validate ([#34967](#34967)) ([6650212](6650212))
* v14, Bank Reconcile Tools not cover case JV debit bank ([#35000](#35000)) ([82d8379](82d8379))
* validation for internal transfer entry ([a582354](a582354))
* value of depreciable assets not updating after manual depr entry [v14] ([#35010](#35010)) ([3c75e55](3c75e55))
* wrong qty of remaining work orders to be created when using "Create" > "Work Order" ([#34726](#34726)) ([47df41f](47df41f))

### Features

* Reconcile Payments in background ([#34596](#34596)) ([5923a80](5923a80))

### Performance Improvements

* Journal Entries (backport [#34918](#34918)) ([#35054](#35054)) ([39b5147](39b5147))

### Reverts

* Revert "fix: Rate from LDC in TDS reports (#33699)" ([f44a79f](f44a79f)), closes [#33699](#33699)
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.23.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@commit-lint commit-lint bot mentioned this pull request Jul 26, 2023
Merged
@saeedkola
Copy link
Contributor

Hello @anandbaburajan
Is this below condition really needed in journal_entry.py?
and d.account_type == "Depreciation"

I have a case where depreciation expense accounts set in the asset category have account_type=Expense and Workflows are set up on Journal Entry.
As a result after the journal entry is approved by the workflow the value_after_depreciation is not getting updated in the asset.
Now there is no other place where we are validating the depreciation expense account to have account type as Depreciation. Neither in Company defaults nor in Asset category.
How will the user know that this is a must in order for the feature to work correctly?
How can this be dealt in the best possible way?

@anandbaburajan
Copy link
Contributor Author

Thanks @saeedkola. I've added a validation here #36659 for the account in asset category.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 8, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@deepeshgarg007 deepeshgarg007 Awaiting requested review from deepeshgarg007 deepeshgarg007 is a code owner

@ruthra-kumar ruthra-kumar Awaiting requested review from ruthra-kumar ruthra-kumar is a code owner

Assignees
No one assigned
Labels
backport version-13-hotfix needs-tests This PR needs automated unit-tests. released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@anandbaburajan @frappe-pr-bot @saeedkola