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

Merge pull request #15150 from rohitwaghchaure/fix_consolidated_balance_sheet_report

Browse Source 
[Fix] Consolidated balance sheet report
This commit is contained in:
rohitwaghchaure 2018-08-15 19:41:41 +05:30 committed by GitHub
commit 7e36aa4162
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,9 +47,10 @@ def get_balance_sheet_data(fiscal_year, companies, columns, filters):
data.extend(asset or []) data.extend(asset or [])
data.extend(liability or []) data.extend(liability or [])
data.extend(equity or []) data.extend(equity or [])
company_currency = frappe.db.get_value("Company", filters.company, "default_currency")
provisional_profit_loss, total_credit = get_provisional_profit_loss(asset, liability, equity, provisional_profit_loss, total_credit = get_provisional_profit_loss(asset, liability, equity,
companies, filters.get('company'), True) companies, filters.get('company'), company_currency, True)
message, opening_balance = check_opening_balance(asset, liability, equity) message, opening_balance = check_opening_balance(asset, liability, equity)