fix: root type in account map for balance sheet #36303
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## develop #36303 +/- ##
===========================================
- Coverage 64.69% 64.53% -0.16%
===========================================
Files 786 786
Lines 61111 61123 +12
===========================================
- Hits 39537 39447 -90
- Misses 21574 21676 +102
|
deepeshgarg007
requested changes
Jul 27, 2023
There was a problem hiding this comment.
set_gl_entries_by_account is also called from the trial balance report where it needs to fetch all the accounts and not just for a specific root_type.
The root_type can be made an optional parameter and only called from the balance sheet
The same changes will also apply to consolidated financial statements
| "is_group": 0, | ||
| "lft": (">=", root_lft), | ||
| "rgt": ("<=", root_rgt), | ||
| "root_type": root_type, |
There was a problem hiding this comment.
Root type should be passed as a parameter to filters only if has a value, passing None will give undesired results
mergify bot
pushed a commit
that referenced
this pull request
Jul 31, 2023
* fix: root type in account map * fix: fetch gle by root type in consolidated financial statement * refactor: consolidated financial statement gle query * fix: filter accounts by root type (cherry picked from commit 11bd15e) # Conflicts: # erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py
deepeshgarg007
added a commit
that referenced
this pull request
Aug 1, 2023
* fix: root type in account map for balance sheet (#36303) * fix: root type in account map * fix: fetch gle by root type in consolidated financial statement * refactor: consolidated financial statement gle query * fix: filter accounts by root type (cherry picked from commit 11bd15e) # Conflicts: # erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py * chore: Resolve conflicts --------- Co-authored-by: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
frappe-pr-bot
pushed a commit
that referenced
this pull request
Aug 1, 2023
# [14.33.0](v14.32.1...v14.33.0) (2023-08-01) ### Bug Fixes * allow fully depreciated existing assets ([#36378](#36378)) ([43b85c5](43b85c5)) * change fieldtype from Currency to Float for the valuation rate in the stock report ([93bd4c7](93bd4c7)) * cost center filter for fetching payments ([c9daa85](c9daa85)) * Defined "Open" Status as default (backport [#36421](#36421)) ([#36424](#36424)) ([33a9477](33a9477)) * filter by cost center in trial balance ([02428b4](02428b4)) * german translations ([9c8e2a3](9c8e2a3)) * GL Entries should not be splitted based on cost center allocation in PCV ([ade13e6](ade13e6)) * group item reorder by (warehouse, material_request_type) (backport [#35818](#35818)) ([#36425](#36425)) ([516191b](516191b)) * Ignore account closing balance for financial statement ([800417e](800417e)) * in payment_entry 'Unallocated Amount' cal is broken ([#36369](#36369)) ([cd3b85c](cd3b85c)) * incorrect `idx` on JE's after reconciliation ([80eb875](80eb875)) * incorrect qty set in the serial no picker ([57b19a5](57b19a5)) * incorrect usage `get_cached_value` on single doctypes ([8f72a68](8f72a68)) * **Item Group:** allow root deletion ([1a6be5e](1a6be5e)) * job card suggest holiday as start date (backport [#35958](#35958)) ([#36423](#36423)) ([29ddd26](29ddd26)) * Job Card validation fixed when displaying total completed quantity ([7b3bcd3](7b3bcd3)) * multiple issues related to Production Plan (backport [#36377](#36377)) ([#36381](#36381)) ([a799e1b](a799e1b)) * not able to make material request (backport [#36416](#36416)) ([#36426](#36426)) ([99e7406](99e7406)) * only publish repost progress to doc subscriber (backport [#36400](#36400)) ([#36402](#36402)) ([32bdb7c](32bdb7c)) * overallocation validation misfire on normal invoices ([#36349](#36349)) ([09af485](09af485)) * paid_amount when the group is mode of payment ([50ef358](50ef358)) * process_owner is not link User (backport [#36420](#36420)) ([#36422](#36422)) ([289dc36](289dc36)) * removed "fetch_from" (backport [#36365](#36365)) ([#36386](#36386)) ([6d051f5](6d051f5)) * root type in account map for balance sheet ([#36303](#36303)) ([5b56296](5b56296)) * show invoices name instead of object address ([e802f0c](e802f0c)) * show tds & tcs separately ([619b0fe](619b0fe)) * test with None conditon in PE ([479cab0](479cab0)) * typo in loyalty program throw message ([#36432](#36432)) ([782a4d1](782a4d1)) ### Features * add party type filter ([32fea64](32fea64)) ### Performance Improvements * avoid full table scan in sle count check ([#36428](#36428)) ([04f9915](04f9915)) * move project status reminder to hourly (backport [#36372](#36372)) ([#36373](#36373)) ([4ac60cd](4ac60cd)) * use `LEFT JOIN` instead of `NOT EXISTS` (backport [#36221](#36221)) ([#36383](#36383)) ([26a0b3b](26a0b3b))
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
The Balance Sheet creates an Account map for all accounts with a specific root type but the entries pulled from the GL Entry table are not filtered by the root type. No account information is fetched from the accounts map for entries having a different root type.
Solution
Added the filter for the root type while fetching the GL entries.