Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #33406 from deepeshgarg007/cs_cf_report_fix

Browse Source 
fix: Consolidated financial report
This commit is contained in:
Deepesh Garg 2022-12-20 18:22:58 +05:30 committed by GitHub
commit 76be35aaea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -268,10 +268,12 @@ def get_cash_flow_data(fiscal_year, companies, filters):
def get_account_type_based_data(account_type, companies, fiscal_year, filters): def get_account_type_based_data(account_type, companies, fiscal_year, filters):
data = {} data = {}
total = 0 total = 0
filters.account_type = account_type
filters.start_date = fiscal_year.year_start_date
filters.end_date = fiscal_year.year_end_date
for company in companies: for company in companies:
amount = get_account_type_based_gl_data( amount = get_account_type_based_gl_data(company, filters)
company, fiscal_year.year_start_date, fiscal_year.year_end_date, account_type, filters
)
if amount and account_type == "Depreciation": if amount and account_type == "Depreciation":
amount *= -1 amount *= -1