mirror of
https://github.com/frappe/erpnext.git
synced 2026-06-08 15:42:52 +00:00
fix: update formatter to handle blank rows in financial statements
(cherry picked from commit 814c11200a)
This commit is contained in:
committed by
Mergify
parent
e8a6933ff3
commit
f657503ea3
@@ -15,7 +15,7 @@ erpnext.financial_statements = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
formatter: function (value, row, column, data, default_formatter, filter) {
|
formatter: function (value, row, column, data, default_formatter, filter) {
|
||||||
if (erpnext.financial_statements._is_separator_row(data)) return "";
|
if (erpnext.financial_statements.is_blank_row(data)) return "";
|
||||||
|
|
||||||
const report_params = [value, row, column, data, default_formatter, filter];
|
const report_params = [value, row, column, data, default_formatter, filter];
|
||||||
// Growth/Margin
|
// Growth/Margin
|
||||||
@@ -27,8 +27,15 @@ erpnext.financial_statements = {
|
|||||||
else return erpnext.financial_statements._format_standard_report(...report_params);
|
else return erpnext.financial_statements._format_standard_report(...report_params);
|
||||||
},
|
},
|
||||||
|
|
||||||
_is_separator_row: function (data) {
|
is_blank_row: function (data) {
|
||||||
return data && !data.account && !data.account_name && !data.section_name;
|
return (
|
||||||
|
data &&
|
||||||
|
!data.account &&
|
||||||
|
!data.accounts &&
|
||||||
|
!data.child_accounts &&
|
||||||
|
!data.account_name &&
|
||||||
|
!data.section_name
|
||||||
|
);
|
||||||
},
|
},
|
||||||
|
|
||||||
_is_special_view: function (column, data) {
|
_is_special_view: function (column, data) {
|
||||||
|
|||||||
Reference in New Issue
Block a user