Skip to content

Commit

Permalink
Merge pull request #43338 from frappe/mergify/bp/version-15-hotfix/pr…
Browse files Browse the repository at this point in the history
…-43308

fix: show chart tool tip in report currency (backport #43308)
  • Loading branch information
ruthra-kumar committed Sep 23, 2024
2 parents 5920525 + 927f800 commit 15baa3f
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 9 deletions.
8 changes: 6 additions & 2 deletions erpnext/accounts/report/balance_sheet/balance_sheet.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ def execute(filters=None):
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(
period_list, asset, liability, equity, provisional_profit_loss, currency, filters
Expand Down Expand Up @@ -221,7 +221,7 @@ def get_report_summary(
], (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:]]

asset_data, liability_data, equity_data = [], [], []
Expand Down Expand Up @@ -249,4 +249,8 @@ def get_chart_data(filters, columns, asset, liability, equity):
else:
chart["type"] = "line"

chart["fieldtype"] = "Currency"
chart["options"] = "currency"
chart["currency"] = currency

return chart
6 changes: 4 additions & 2 deletions erpnext/accounts/report/cash_flow/cash_flow.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ def execute(filters=None):
)
columns = get_columns(filters.periodicity, period_list, filters.accumulated_values, filters.company)

chart = get_chart_data(columns, data)
chart = get_chart_data(columns, data, company_currency)

report_summary = get_report_summary(summary_data, company_currency)

Expand Down Expand Up @@ -252,7 +252,7 @@ def get_report_summary(summary_data, currency):
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:]]
datasets = [
{
Expand All @@ -267,5 +267,7 @@ def get_chart_data(columns, data):
chart = {"data": {"labels": labels, "datasets": datasets}, "type": "bar"}

chart["fieldtype"] = "Currency"
chart["options"] = "currency"
chart["currency"] = currency

return chart
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ def get_balance_sheet_data(fiscal_year, companies, columns, filters):
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

Expand Down Expand Up @@ -173,7 +173,7 @@ def get_profit_loss_data(fiscal_year, companies, columns, filters):
if 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(
companies, "", income, expense, net_profit_loss, company_currency, filters, True
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ def execute(filters=None):

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(
"Company", filters.company, "default_currency"
)
chart = get_chart_data(filters, columns, income, expense, net_profit_loss, currency)

report_summary, primitive_summary = get_report_summary(
period_list, filters.periodicity, income, expense, net_profit_loss, currency, filters
)
Expand Down Expand Up @@ -152,7 +152,7 @@ def get_net_profit_loss(income, expense, period_list, company, currency=None, co
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:]]

income_data, expense_data, net_profit = [], [], []
Expand Down Expand Up @@ -181,5 +181,7 @@ def get_chart_data(filters, columns, income, expense, net_profit_loss):
chart["type"] = "line"

chart["fieldtype"] = "Currency"
chart["options"] = "currency"
chart["currency"] = currency

return chart

0 comments on commit 15baa3f

Please sign in to comment.