vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: Handle row which can be dict while printing (#7163)

Browse source
This commit is contained in:
Faris Ansari 2019-03-29 23:03:42 +05:30 • committed by GitHub
parent 4bfec7ca19
commit b48755a9a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
frappe/public/js/frappe/views/reports/report_view.js
View file

@ -859,13 +859,18 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
align,
compareValue: compareFn,
format: (value, row, column, data) => {
const d = row.reduce((acc, curr) => {
if (!curr.column.docfield) return acc;
acc[curr.column.docfield.fieldname] = curr.content;
return acc;
}, {});
let doc = null;
if (Array.isArray(row)) {
doc = row.reduce((acc, curr) => {
if (!curr.column.docfield) return acc;
acc[curr.column.docfield.fieldname] = curr.content;
return acc;
}, {});
} else {
doc = row;
}
return frappe.format(value, column.docfield, { always_show_decimals: true }, d);
return frappe.format(value, column.docfield, { always_show_decimals: true }, doc);
}
};
}