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: don't add GL Entry for Acc. Depr. while scrapping non-depreciable assets #35714

Merged
merged 1 commit into from
Jun 15, 2023
Merged

fix: don't add GL Entry for Acc. Depr. while scrapping non-depreciable assets #35714

merged 1 commit into from
Jun 15, 2023

Conversation

anandbaburajan
Copy link
Contributor

Problem:

On scrapping of non-depreciable assets, the system fails with Row 2: Both Debit and Credit values cannot be zero because it tries to add a GL entry with 0 debit and 0 credit for the Accumulated Depreciation account.

Solution:

Don't add GL Entry for the Accumulated Depreciation account while scrapping non-depreciable assets.

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Jun 15, 2023
@anandbaburajan anandbaburajan merged commit bb39a2c into frappe:develop Jun 15, 2023
mergify bot pushed a commit that referenced this pull request Jun 15, 2023
@anandbaburajan @mergify
fix: don't add GL Entry for Acc. Depr. while scrapping non-depreciabl…
be04b79 
…e assets (#35714)

fix: on asset scrap, don't add gl entry for acc. depr. if no acc. depr.
(cherry picked from commit bb39a2c)
@mergify mergify bot mentioned this pull request Jun 15, 2023
Merged
mergify bot pushed a commit that referenced this pull request Jun 15, 2023
@anandbaburajan @mergify
fix: don't add GL Entry for Acc. Depr. while scrapping non-depreciabl…
5b912d3 
…e assets (#35714)

fix: on asset scrap, don't add gl entry for acc. depr. if no acc. depr.
(cherry picked from commit bb39a2c)

# Conflicts:
#	erpnext/assets/doctype/asset/depreciation.py
@mergify mergify bot mentioned this pull request Jun 15, 2023
Merged
anandbaburajan added a commit that referenced this pull request Jun 15, 2023
@mergify @anandbaburajan
fix: don't add GL Entry for Acc. Depr. while scrapping non-depreciabl…
77b0c5f 
…e assets (backport #35714) (#35715)

fix: don't add GL Entry for Acc. Depr. while scrapping non-depreciable assets (#35714)

fix: on asset scrap, don't add gl entry for acc. depr. if no acc. depr.
(cherry picked from commit bb39a2c)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
anandbaburajan added a commit that referenced this pull request Jun 15, 2023
@mergify @anandbaburajan
fix: don't add GL Entry for Acc. Depr. while scrapping non-depreciabl…
0e11317 
…e assets (backport #35714) (#35716)

* fix: don't add GL Entry for Acc. Depr. while scrapping non-depreciable assets (#35714)

fix: on asset scrap, don't add gl entry for acc. depr. if no acc. depr.
(cherry picked from commit bb39a2c)

# Conflicts:
#	erpnext/assets/doctype/asset/depreciation.py

* chore: fix conflict

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
frappe-pr-bot pushed a commit that referenced this pull request Jun 20, 2023
@frappe-bot
chore(release): Bumped to Version 14.27.9
2561cf2 
## [14.27.9](v14.27.8...v14.27.9) (2023-06-20)

### Bug Fixes

* `Process Loss Report` (backport [#35712](#35712)) ([#35719](#35719)) ([55a8be5](55a8be5))
* add validation for QI in PR (backport [#35677](#35677)) ([#35757](#35757)) ([59ab13c](59ab13c))
* Allocated amount validation for other party types ([#35741](#35741)) ([5541d68](5541d68))
* cannot start / stop jobs ([53ec2a9](53ec2a9))
* conflicts ([697fcef](697fcef))
* consider field precision while setting sle actual_qty ([#35717](#35717)) ([3f62e85](3f62e85))
* date and finance book fixes in fixed asset register (backport [#35751](#35751)) ([#35799](#35799)) ([8b57ecd](8b57ecd))
* don't add GL Entry for Acc. Depr. while scrapping non-depreciable assets (backport [#35714](#35714)) ([#35715](#35715)) ([77b0c5f](77b0c5f))
* Duplicate addresses are creating while using the E-commerce ([703e4f4](703e4f4))
* fix get outstanding invoices btn and add get outstanding orders btn (backport [#35776](#35776)) ([#35787](#35787)) ([42e25d4](42e25d4))
* for zero bal accounts, dr/cr only on currency that has balance ([7da461b](7da461b))
* incorrect gl entries for standalone debit note with update stock ([3355dc2](3355dc2))
* incorrect stock value for purchase returned with rejected qty (backport [#35747](#35747)) ([#35752](#35752)) ([c11d950](c11d950))
* keyerror while checking the stock balance report ([baf014f](baf014f))
* loan interest accrual date ([#35695](#35695)) ([070df97](070df97))
* **patch:** enable existing serial no in stock settings ([#35762](#35762)) ([3c790c1](3c790c1))
* stock error for service item ([2bbea63](2bbea63))
* test case ([4af0a9b](4af0a9b))
* unsupported operand type(s) for //: 'float' and 'NoneType' for POS Barcode search ([#35710](#35710)) ([58a6bbc](58a6bbc))
* update `Stock Reconciliation` diff qty while reposting ([bdb5cc8](bdb5cc8))
* **ux:** set route options for new `Batch` ([b261242](b261242))
* validation of job card in stock entry ([ce2bf5f](ce2bf5f))
* work order serial no issue ([50a8907](50a8907))

### Performance Improvements

* Duplicate queries for UOM (backport [#35744](#35744)) ([#35745](#35745)) ([632b67c](632b67c))
* duplicate queries while checking prevdoc (backport [#35746](#35746)) ([#35749](#35749)) ([a0fc8e2](a0fc8e2))
* Ignore cancelled pick lists while fetching picked items (backport [#35737](#35737)) ([#35740](#35740)) ([01ac54d](01ac54d))
* index `purpose` in `Stock Entry` (backport [#35782](#35782)) ([#35783](#35783)) ([3bac2a8](3bac2a8))
* Index pick list field in stock entry and DN (backport [#35738](#35738)) ([#35742](#35742)) ([b875de6](b875de6))
* Index sales_order_item in Pick list item (backport [#35735](#35735)) ([#35736](#35736)) ([0e57f4d](0e57f4d))
frappe-pr-bot pushed a commit that referenced this pull request Jun 21, 2023
@frappe-bot
chore(release): Bumped to Version 13.51.6
60a170d 
## [13.51.6](v13.51.5...v13.51.6) (2023-06-21)

### Bug Fixes

* account group totals calculation to consider include_in_gross ([f22969d](f22969d))
* add total col for gross and net profit ([e899c30](e899c30))
* add validation for QI in PR (backport [#35677](#35677)) ([#35758](#35758)) ([0a8b714](0a8b714))
* Allocated amount validation for other party types ([#35741](#35741)) ([3d0add8](3d0add8))
* date and finance book fixes in fixed asset register (backport [#35751](#35751)) ([#35800](#35800)) ([aa8446d](aa8446d))
* don't add GL Entry for Acc. Depr. while scrapping non-depreciable assets (backport [#35714](#35714)) ([#35716](#35716)) ([0e11317](0e11317))
* fix get outstanding invoices btn and add get outstanding orders btn (backport [#35776](#35776)) ([#35788](#35788)) ([04990d5](04990d5))
* Incorrect field while calculating Tax withholding net total ([571c977](571c977))
* Incorrect field while calculating Tax withholding net total ([b95d459](b95d459))
* loan interest accrual date ([#35695](#35695)) ([46d0b7d](46d0b7d))

### Performance Improvements

* index `purpose` in `Stock Entry` (backport [#35782](#35782)) ([#35784](#35784)) ([7239e83](7239e83))
@commit-lint commit-lint bot mentioned this pull request Jun 28, 2023
Merged
@ankush ankush mentioned this pull request Oct 20, 2023
Closed
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 25, 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

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

Successfully merging this pull request may close these issues.
1 participant
@anandbaburajan