nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-24 04:26:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: add regression test for trends chart total row

Browse Source
This commit is contained in:
S Sakthivel Murugan
2026-07-05 00:14:02 +05:30
committed by Sakthivel Murugan S
parent e6f9149ad7
commit b72ecdda0d
10 changed files with 470 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/controllers/trends.py
View File

@@ -43,6 +43,9 @@ def get_columns(filters, trans):
"addl_tables": based_on_details["addl_tables"],
"addl_tables_relational_cond": based_on_details.get("addl_tables_relational_cond", ""),
}
conditions["company_currency"] = (
erpnext.get_company_currency(filters.get("company")) if filters.get("company") else None
)
return conditions
@@ -215,7 +218,7 @@ def get_data(filters, conditions):
data.append(des)
total_row = calculate_total_row(data1, conditions["columns"], filters.get("company"))
total_row = calculate_total_row(data1, conditions["columns"], conditions.get("company_currency"))
data.append(total_row)
else:
data = frappe.db.sql(
@@ -240,13 +243,13 @@ def get_data(filters, conditions):
as_list=1,
)
total_row = calculate_total_row(data, conditions["columns"], filters.get("company"))
total_row = calculate_total_row(data, conditions["columns"], conditions.get("company_currency"))
data.append(total_row)
return data
def calculate_total_row(data, columns, company=None):
def calculate_total_row(data, columns, company_currency=None):
def wrap_in_quotes(label):
return f"'{label}'"
@@ -255,7 +258,7 @@ def calculate_total_row(data, columns, company=None):
for i, col in enumerate(columns):
if "Float" in col or "Currency/currency" in col:
total_values[i] = 0
if col.split(":")[0] == "Currency":
if "Link/Currency" in col:
currency_col_idx = i
for row in data:
@@ -267,7 +270,7 @@ def calculate_total_row(data, columns, company=None):
total_row.append(total_values.get(i, None))
if currency_col_idx is not None:
total_row[currency_col_idx] = company and erpnext.get_company_currency(company)
total_row[currency_col_idx] = company_currency
return total_row