Fix cash flow report: total row calculation for Parent Account and and spacer (Empty Row)#53045
Open
AhmedAbokhatwa wants to merge 7336 commits intofrappe:developfrom
Open
Fix cash flow report: total row calculation for Parent Account and and spacer (Empty Row)#53045AhmedAbokhatwa wants to merge 7336 commits intofrappe:developfrom
AhmedAbokhatwa wants to merge 7336 commits intofrappe:developfrom
Conversation
(cherry picked from commit a0256bd)
…fix/pr-50913 fix: variant items not fetched while making BOM for Variant Item (backport frappe#50913)
(cherry picked from commit 70521fb) # Conflicts: # erpnext/stock/doctype/item/item.json # erpnext/stock/doctype/item/item.py
…fix/pr-50879 fix: remove set_only_once from is_fixed_asset field (backport frappe#50879)
…ccounting (cherry picked from commit d6bdbfe)
(cherry picked from commit 31d5524) # Conflicts: # erpnext/utilities/bulk_transaction.py
…fix/pr-50943 fix(sales invoice): 100% additional discount gl issue with discount accounting (backport frappe#50943)
…fix/pr-50931 fix(bulk transaction process): skip records creation if original records are marked 'On Hold' or 'Closed' (backport frappe#50931)
(cherry picked from commit 95e6c72) # Conflicts: # erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py # erpnext/stock/doctype/stock_entry/stock_entry.py
Removed posting_datetime and type_of_transaction from the query.
…fix/pr-50742 fix: inward same serial / batches in disassembly which were used (backport frappe#50742)
(cherry picked from commit 264baf3)
…fix/pr-50972 fix: incorrect condition (backport frappe#50972)
fix: Missing attribute error
…49963) (frappe#50985) Co-authored-by: ljain112 <ljain112@gmail.com> Co-authored-by: Smit Vora <smitvora203@gmail.com> Co-authored-by: Diptanil Saha <diptanil@frappe.io>
(cherry picked from commit 5154fa8)
(cherry picked from commit 1bcfad8)
…fix/pr-50978 fix: performance of the reposting (backport frappe#50978)
(cherry picked from commit f26ee9e) # Conflicts: # erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
(cherry picked from commit f48b90c)
…fix/pr-51171 fix: validate party's existing transaction currency before merging (backport frappe#51171)
(cherry picked from commit aae0448) # Conflicts: # erpnext/accounts/doctype/payment_entry/payment_entry.js
…fix/pr-51361 fix(payment entry): clear party_name for internal transfer (backport frappe#51361)
(cherry picked from commit 469a1ad)
(cherry picked from commit 292a51c)
…fix/pr-51380 fix: expense_account query override in Purchase Receipt (backport frappe#51380)
…fix/pr-51368 fix: start reposting accounting ledger after commit (backport frappe#51368)
(cherry picked from commit 6fc9636)
(cherry picked from commit 9dfb0fd)
…fix/pr-51340 fix(bank reconciliation tool): carry bank account to payment entry (backport frappe#51340)
chore: release v15
## [15.93.1](frappe/erpnext@v15.93.0...v15.93.1) (2025-12-30) ### Bug Fixes * **accounts-payable-summary:** add Show GL Balance check similar to A… (backport [frappe#50802](frappe#50802)) ([frappe#50805](frappe#50805)) ([a04f560](frappe@a04f560)) * **bank reconciliation tool:** carry bank account to payment entry ([cd930c0](frappe@cd930c0)) * **bank reconciliation tool:** fix incorrect bank account field mapping ([9ef0e8b](frappe@9ef0e8b)) * expense_account query override in Purchase Receipt ([6f3904a](frappe@6f3904a)) * **payment entry:** clear party_name for internal transfer ([431e687](frappe@431e687)) * prevent reuse of serial no in manufacture and repack entry ([24f6f1e](frappe@24f6f1e)) * **repost accounting ledger:** prevent preview generation when no vouchers are selected ([93c1a3f](frappe@93c1a3f)) * start reposting accounting ledger after commit ([e6acdf3](frappe@e6acdf3)) * **stock:** remove total bar in chart view ([d9888d5](frappe@d9888d5)) * updating base amounts through python for timesheet for v15 ([9d2e0f6](frappe@9d2e0f6)) * validate depreciation row values ([2f10b9c](frappe@2f10b9c)) * validate party's existing transaction currency before merging ([1c40a61](frappe@1c40a61)) ### Performance Improvements * composite index for serial no ([507a561](frappe@507a561)) * index for warehouse field ([4753594](frappe@4753594))
Removed unused on_discard method and cleaned up code. (cherry picked from commit 46f3ab1)
…51470 fix: not able to submit backdated stock reco (backport frappe#51468) (backport frappe#51470)
## [15.93.2](frappe/erpnext@v15.93.1...v15.93.2) (2026-01-03) ### Bug Fixes * not able to submit backdated stock reco ([9ef7d45](frappe@9ef7d45))
- changed parent_section → parent_account for correct total calculation
- replaced empty {} with a proper spacer row to avoid 0.00 in report
AhmedAbokhatwa
requested review from
khushi8112,
mihir-kandoi,
rohitwaghchaure and
ruthra-kumar
as code owners
github-actions
bot
added
accounts
assets
buying
CRM
projects
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
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.
Fix cash flow report: total row calculation and spacer
1- Replaced empty row {} with proper spacer row to avoid 0.00 in report
2- Removed unnecessary quotes around account/section names
3- modified: erpnext/accounts/report/cash_flow/cash_flow.py