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

Merge pull request #43308 from aerele/report-chart-currency

Browse Source 
fix: show chart tool tip in report currency
This commit is contained in:
ruthra kumar
2024-09-23 17:39:46 +05:30
committed by GitHub
parent fc9b1ef7a3 91a27bda84
commit 8fccc70136
4 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,7 +95,7 @@ def execute(filters=None):
filters.periodicity, period_list, filters.accumulated_values, company=filters.company filters.periodicity, period_list, filters.accumulated_values, company=filters.company
) )
chart = get_chart_data(filters, columns, asset, liability, equity) chart = get_chart_data(filters, columns, asset, liability, equity, currency)
report_summary, primitive_summary = get_report_summary( report_summary, primitive_summary = get_report_summary(
period_list, asset, liability, equity, provisional_profit_loss, currency, filters period_list, asset, liability, equity, provisional_profit_loss, currency, filters
@@ -221,7 +221,7 @@ def get_report_summary(
], (net_asset - net_liability + net_equity) ], (net_asset - net_liability + net_equity)
def get_chart_data(filters, columns, asset, liability, equity): def get_chart_data(filters, columns, asset, liability, equity, currency):
labels = [d.get("label") for d in columns[2:]] labels = [d.get("label") for d in columns[2:]]
asset_data, liability_data, equity_data = [], [], [] asset_data, liability_data, equity_data = [], [], []
@@ -249,4 +249,8 @@ def get_chart_data(filters, columns, asset, liability, equity):
else: else:
chart["type"] = "line" chart["type"] = "line"
chart["fieldtype"] = "Currency"
chart["options"] = "currency"
chart["currency"] = currency
return chart return chart

6
erpnext/accounts/report/cash_flow/cash_flow.py
View File

@@ -120,7 +120,7 @@ def execute(filters=None):
) )
columns = get_columns(filters.periodicity, period_list, filters.accumulated_values, filters.company, True) columns = get_columns(filters.periodicity, period_list, filters.accumulated_values, filters.company, True)
chart = get_chart_data(columns, data) chart = get_chart_data(columns, data, company_currency)
report_summary = get_report_summary(summary_data, company_currency) report_summary = get_report_summary(summary_data, company_currency)
@@ -261,7 +261,7 @@ def get_report_summary(summary_data, currency):
return report_summary return report_summary
def get_chart_data(columns, data): def get_chart_data(columns, data, currency):
labels = [d.get("label") for d in columns[2:]] labels = [d.get("label") for d in columns[2:]]
print(data) print(data)
datasets = [ datasets = [
@@ -277,5 +277,7 @@ def get_chart_data(columns, data):
chart = {"data": {"labels": labels, "datasets": datasets}, "type": "bar"} chart = {"data": {"labels": labels, "datasets": datasets}, "type": "bar"}
chart["fieldtype"] = "Currency" chart["fieldtype"] = "Currency"
chart["options"] = "currency"
chart["currency"] = currency
return chart return chart

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

@@ -115,7 +115,7 @@ def get_balance_sheet_data(fiscal_year, companies, columns, filters):
True, True,
) )
chart = get_chart_data(filters, columns, asset, liability, equity) chart = get_chart_data(filters, columns, asset, liability, equity, company_currency)
return data, message, chart, report_summary return data, message, chart, report_summary
@@ -173,7 +173,7 @@ def get_profit_loss_data(fiscal_year, companies, columns, filters):
if net_profit_loss: if net_profit_loss:
data.append(net_profit_loss) data.append(net_profit_loss)
chart = get_pl_chart_data(filters, columns, income, expense, net_profit_loss) chart = get_pl_chart_data(filters, columns, income, expense, net_profit_loss, company_currency)
report_summary, primitive_summary = get_pl_summary( report_summary, primitive_summary = get_pl_summary(
companies, "", income, expense, net_profit_loss, company_currency, filters, True companies, "", income, expense, net_profit_loss, company_currency, filters, True

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

@@ -59,11 +59,11 @@ def execute(filters=None):
columns = get_columns(filters.periodicity, period_list, filters.accumulated_values, filters.company) columns = get_columns(filters.periodicity, period_list, filters.accumulated_values, filters.company)
chart = get_chart_data(filters, columns, income, expense, net_profit_loss)
currency = filters.presentation_currency or frappe.get_cached_value( currency = filters.presentation_currency or frappe.get_cached_value(
"Company", filters.company, "default_currency" "Company", filters.company, "default_currency"
) )
chart = get_chart_data(filters, columns, income, expense, net_profit_loss, currency)
report_summary, primitive_summary = get_report_summary( report_summary, primitive_summary = get_report_summary(
period_list, filters.periodicity, income, expense, net_profit_loss, currency, filters period_list, filters.periodicity, income, expense, net_profit_loss, currency, filters
) )
@@ -152,7 +152,7 @@ def get_net_profit_loss(income, expense, period_list, company, currency=None, co
return net_profit_loss return net_profit_loss
def get_chart_data(filters, columns, income, expense, net_profit_loss): def get_chart_data(filters, columns, income, expense, net_profit_loss, currency):
labels = [d.get("label") for d in columns[2:]] labels = [d.get("label") for d in columns[2:]]
income_data, expense_data, net_profit = [], [], [] income_data, expense_data, net_profit = [], [], []
@@ -181,5 +181,7 @@ def get_chart_data(filters, columns, income, expense, net_profit_loss):
chart["type"] = "line" chart["type"] = "line"
chart["fieldtype"] = "Currency" chart["fieldtype"] = "Currency"
chart["options"] = "currency"
chart["currency"] = currency
return chart return chart