From 9b8e0eb5c52bc1319c4fae6232e3259b6f489721 Mon Sep 17 00:00:00 2001 From: Diptanil Saha Date: Wed, 16 Jul 2025 11:43:36 +0530 Subject: [PATCH] revert: "feat: trial balance report account name and number in separate column" (#48624) Revert "feat: trial balance report account name and number in separate column" --- .../report/trial_balance/trial_balance.js | 5 ---- .../report/trial_balance/trial_balance.py | 26 ++----------------- 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/erpnext/accounts/report/trial_balance/trial_balance.js b/erpnext/accounts/report/trial_balance/trial_balance.js index 6f3f55b90a2..e3f32ab974f 100644 --- a/erpnext/accounts/report/trial_balance/trial_balance.js +++ b/erpnext/accounts/report/trial_balance/trial_balance.js @@ -117,11 +117,6 @@ frappe.query_reports["Trial Balance"] = { fieldtype: "Check", default: 1, }, - { - fieldname: "show_account_name_and_number", - label: __("Show Account Name and Number"), - fieldtype: "Check", - }, ], formatter: erpnext.financial_statements.formatter, tree: true, diff --git a/erpnext/accounts/report/trial_balance/trial_balance.py b/erpnext/accounts/report/trial_balance/trial_balance.py index 36209a94f92..587a8ea95cb 100644 --- a/erpnext/accounts/report/trial_balance/trial_balance.py +++ b/erpnext/accounts/report/trial_balance/trial_balance.py @@ -32,7 +32,7 @@ value_fields = ( def execute(filters=None): validate_filters(filters) data = get_data(filters) - columns = get_columns(filters) + columns = get_columns() return columns, data @@ -407,10 +407,6 @@ def prepare_data(accounts, filters, parent_children_map, company_currency): ), } - if filters.get("show_account_name_and_number"): - row["acc_name"] = d.account_name - row["acc_number"] = d.account_number - for key in value_fields: row[key] = flt(d.get(key, 0.0), 3) @@ -431,24 +427,7 @@ def prepare_data(accounts, filters, parent_children_map, company_currency): return data -def get_columns(filters): - account_name_number_cols = [] - if filters.get("show_account_name_and_number"): - account_name_number_cols = [ - { - "fieldname": "acc_name", - "label": _("Account Name"), - "fieldtype": "Data", - "width": 250, - }, - { - "fieldname": "acc_number", - "label": _("Account Number"), - "fieldtype": "Data", - "width": 120, - }, - ] - +def get_columns(): return [ { "fieldname": "account", @@ -457,7 +436,6 @@ def get_columns(filters): "options": "Account", "width": 300, }, - *account_name_number_cols, { "fieldname": "currency", "label": _("Currency"),