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

[Fix] Profit and loss statment

Browse Source
This commit is contained in:
Rohit Waghchaure 2018-04-18 15:56:24 +05:30 committed by Nabin Hait
parent 074928cf6c
commit 26decaad6c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,11 +87,12 @@ def get_profit_loss_data(fiscal_year, companies, columns, filters):
return data, None, chart return data, None, chart
def get_income_expense_data(companies, fiscal_year, filters): def get_income_expense_data(companies, fiscal_year, filters):
company_currency = frappe.db.get_value("Company", filters.company, "default_currency")
income = get_data(companies, "Income", "Credit", fiscal_year, filters, True) income = get_data(companies, "Income", "Credit", fiscal_year, filters, True)
expense = get_data(companies, "Expense", "Debit", fiscal_year, filters, True) expense = get_data(companies, "Expense", "Debit", fiscal_year, filters, True)
net_profit_loss = get_net_profit_loss(income, expense, companies, filters.company, True) net_profit_loss = get_net_profit_loss(income, expense, companies, filters.company, company_currency, True)
return income, expense, net_profit_loss return income, expense, net_profit_loss