From db1f7fcf6346a6ba6c4e37a175fd64e09ce52b5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CKhushi?= <“khushirawat.sophia@gamil.com”> Date: Wed, 27 Mar 2024 16:48:49 +0530 Subject: [PATCH 1/2] fix: fixed incorrect cash flow data in finacial statement report --- .../consolidated_financial_statement.py | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py b/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py index 0051ba6aa8d..1180856c191 100644 --- a/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py +++ b/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py @@ -272,6 +272,7 @@ def get_account_type_based_data(account_type, companies, fiscal_year, filters): filters.end_date = fiscal_year.year_end_date for company in companies: + filters.company = company amount = get_account_type_based_gl_data(company, filters) if amount and account_type == "Depreciation": From 46736a737f0b0d9efc28e42ea268caf93076bf05 Mon Sep 17 00:00:00 2001 From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> Date: Fri, 26 Apr 2024 12:36:34 +0530 Subject: [PATCH 2/2] fix(minor): don't translate voucher type --- erpnext/accounts/report/general_ledger/general_ledger.py | 1 - 1 file changed, 1 deletion(-) diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py index cefa1eecd54..03827cb25f5 100644 --- a/erpnext/accounts/report/general_ledger/general_ledger.py +++ b/erpnext/accounts/report/general_ledger/general_ledger.py @@ -460,7 +460,6 @@ def get_accountwise_gle(filters, accounting_dimensions, gl_entries, gle_map): for gle in gl_entries: group_by_value = gle.get(group_by) - gle.voucher_type = gle.voucher_type gle.voucher_subtype = _(gle.voucher_subtype) gle.against_voucher_type = _(gle.against_voucher_type) gle.remarks = _(gle.remarks)