nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-22 14:39:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #40716 from khushi8112/incorrect-cash-flow-report

Browse Source 
Incorrect cash flow report
This commit is contained in:
Rushabh Mehta
2024-04-26 12:52:57 +05:30
committed by GitHub
parent 3562c2d1d1 46736a737f
commit 1bb1b69dea
2 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py
View File

@@ -266,6 +266,7 @@ def get_account_type_based_data(account_type, companies, fiscal_year, filters):
filters.end_date = fiscal_year.year_end_date filters.end_date = fiscal_year.year_end_date
for company in companies: for company in companies:
filters.company = company
amount = get_account_type_based_gl_data(company, filters) amount = get_account_type_based_gl_data(company, filters)
if amount and account_type == "Depreciation": if amount and account_type == "Depreciation":

1
erpnext/accounts/report/general_ledger/general_ledger.py
View File

@@ -460,7 +460,6 @@ def get_accountwise_gle(filters, accounting_dimensions, gl_entries, gle_map):
for gle in gl_entries: for gle in gl_entries:
group_by_value = gle.get(group_by) group_by_value = gle.get(group_by)
gle.voucher_type = gle.voucher_type
gle.voucher_subtype = _(gle.voucher_subtype) gle.voucher_subtype = _(gle.voucher_subtype)
gle.against_voucher_type = _(gle.against_voucher_type) gle.against_voucher_type = _(gle.against_voucher_type)
gle.remarks = _(gle.remarks) gle.remarks = _(gle.remarks)