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

Merge pull request #13498 from surajshetty3416/fix-charts-rendering

Browse source
This commit is contained in:
Suraj Shetty 2021-06-15 19:36:24 +05:30 • committed by GitHub
commit 724923afab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -410,7 +410,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
x_fields.push({
label: col.content,
fieldname: col.id,
value: col.id,
value: col.id,
});
// numeric values in y
@ -1024,8 +1024,12 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
return docfield.fieldtype === 'Date' ? 'right' : 'left';
})();
let id = fieldname;
// child table column
const id = doctype !== this.doctype ? `${doctype}:${fieldname}` : fieldname;
if (doctype !== this.doctype && fieldname !== '_aggregate_column') {
id = `${doctype}:${fieldname}`;
}
let width = (docfield ? cint(docfield.width) : null) || null;
if (this.report_doc) {