mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-31 10:49:09 +00:00
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"
This commit is contained in:
@@ -117,11 +117,6 @@ frappe.query_reports["Trial Balance"] = {
|
|||||||
fieldtype: "Check",
|
fieldtype: "Check",
|
||||||
default: 1,
|
default: 1,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
fieldname: "show_account_name_and_number",
|
|
||||||
label: __("Show Account Name and Number"),
|
|
||||||
fieldtype: "Check",
|
|
||||||
},
|
|
||||||
],
|
],
|
||||||
formatter: erpnext.financial_statements.formatter,
|
formatter: erpnext.financial_statements.formatter,
|
||||||
tree: true,
|
tree: true,
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ value_fields = (
|
|||||||
def execute(filters=None):
|
def execute(filters=None):
|
||||||
validate_filters(filters)
|
validate_filters(filters)
|
||||||
data = get_data(filters)
|
data = get_data(filters)
|
||||||
columns = get_columns(filters)
|
columns = get_columns()
|
||||||
return columns, data
|
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:
|
for key in value_fields:
|
||||||
row[key] = flt(d.get(key, 0.0), 3)
|
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
|
return data
|
||||||
|
|
||||||
|
|
||||||
def get_columns(filters):
|
def get_columns():
|
||||||
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,
|
|
||||||
},
|
|
||||||
]
|
|
||||||
|
|
||||||
return [
|
return [
|
||||||
{
|
{
|
||||||
"fieldname": "account",
|
"fieldname": "account",
|
||||||
@@ -457,7 +436,6 @@ def get_columns(filters):
|
|||||||
"options": "Account",
|
"options": "Account",
|
||||||
"width": 300,
|
"width": 300,
|
||||||
},
|
},
|
||||||
*account_name_number_cols,
|
|
||||||
{
|
{
|
||||||
"fieldname": "currency",
|
"fieldname": "currency",
|
||||||
"label": _("Currency"),
|
"label": _("Currency"),
|
||||||
|
|||||||
Reference in New Issue
Block a user