nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-04 22:18:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: revert 'stub'

Browse Source
This commit is contained in:
ruthra kumar
2024-11-29 10:52:38 +05:30
parent 48d6fcaab8
commit ae81bb3c1b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/report/financial_statements.py
View File

@@ -620,7 +620,7 @@ def get_cost_centers_with_children(cost_centers):
def get_columns(periodicity, period_list, accumulated_values=1, company=None, cash_flow=False): def get_columns(periodicity, period_list, accumulated_values=1, company=None, cash_flow=False):
columns = [ columns = [
{ {
"fieldname": "stub", "fieldname": "account",
"label": _("Account") if not cash_flow else _("Section"), "label": _("Account") if not cash_flow else _("Section"),
"fieldtype": "Link", "fieldtype": "Link",
"options": "Account", "options": "Account",

4
erpnext/public/js/financial_statements.js
View File

@@ -28,7 +28,7 @@ erpnext.financial_statements = {
return value; return value;
} else if (frappe.query_report.get_filter_value("selected_view") == "Margin" && data) { } else if (frappe.query_report.get_filter_value("selected_view") == "Margin" && data) {
if (column.fieldname == "stub" && data.account_name == __("Income")) { if (column.fieldname == "account" && data.account_name == __("Income")) {
//Taking the total income from each column (for all the financial years) as the base (100%) //Taking the total income from each column (for all the financial years) as the base (100%)
this.baseData = row; this.baseData = row;
} }
@@ -45,7 +45,7 @@ erpnext.financial_statements = {
} }
} }
if (data && column.fieldname == "stub") { if (data && column.fieldname == "account") {
// first column // first column
value = data.section_name || data.account_name || value; value = data.section_name || data.account_name || value;