Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: can't open general ledger from consolidated financial report (#25542)

Browse Source
This commit is contained in:
Saqib 2021-05-04 12:33:49 +05:30 committed by GitHub
parent 1e554378c7
commit 384f4b5b7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 120 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js
View File

@ -2,6 +2,7 @@
// For license information, please see license.txt // For license information, please see license.txt
/* eslint-disable */ /* eslint-disable */
frappe.require("assets/erpnext/js/financial_statements.js", function() {
frappe.query_reports["Consolidated Financial Statement"] = { frappe.query_reports["Consolidated Financial Statement"] = {
"filters": [ "filters": [
{ {
@ -94,6 +95,14 @@ frappe.query_reports["Consolidated Financial Statement"] = {
} }
], ],
"formatter": function(value, row, column, data, default_formatter) { "formatter": function(value, row, column, data, default_formatter) {
if (data && column.fieldname=="account") {
value = data.account_name || value;
column.link_onclick =
"erpnext.financial_statements.open_general_ledger(" + JSON.stringify(data) + ")";
column.is_tree = true;
}
value = default_formatter(value, row, column, data); value = default_formatter(value, row, column, data);
if (!data.parent_account) { if (!data.parent_account) {
@ -117,3 +126,4 @@ frappe.query_reports["Consolidated Financial Statement"] = {
}); });
} }
} }
});

5
erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py
View File

@ -329,8 +329,9 @@ def prepare_data(accounts, start_date, end_date, balance_must_be, companies, com
has_value = False has_value = False
total = 0 total = 0
row = frappe._dict({ row = frappe._dict({
"account_name": _(d.account_name), "account_name": ('%s - %s' %(_(d.account_number), _(d.account_name))
"account": _(d.account_name), if d.account_number else _(d.account_name)),
"account": _(d.name),
"parent_account": _(d.parent_account), "parent_account": _(d.parent_account),
"indent": flt(d.indent), "indent": flt(d.indent),
"year_start_date": start_date, "year_start_date": start_date,