diff --git a/frappe/core/doctype/report/report.py b/frappe/core/doctype/report/report.py index 7c18d5fd27..fd53fad44b 100644 --- a/frappe/core/doctype/report/report.py +++ b/frappe/core/doctype/report/report.py @@ -147,10 +147,12 @@ class Report(Document): limit=limit, user=user) - meta = frappe.get_meta(self.ref_doctype) - - columns = [meta.get_field(c[0]) or frappe._dict(label=meta.get_label(c[0]), fieldname=c[0]) - for c in columns] + _columns = [] + for column in columns: + meta = frappe.get_meta(column[1]) + field = [meta.get_field(column[0]) or frappe._dict(label=meta.get_label(column[0]), fieldname=column[0])] + _columns.extend(field) + columns = _columns out = out + [list(d) for d in result] diff --git a/frappe/email/doctype/auto_email_report/auto_email_report.py b/frappe/email/doctype/auto_email_report/auto_email_report.py index 8903b813dc..8f468f3de5 100644 --- a/frappe/email/doctype/auto_email_report/auto_email_report.py +++ b/frappe/email/doctype/auto_email_report/auto_email_report.py @@ -103,7 +103,7 @@ class AutoEmailReport(Document): @staticmethod def get_spreadsheet_data(columns, data): - out = [[df.label for df in columns], ] + out = [[_(df.label) for df in columns], ] for row in data: new_row = [] out.append(new_row) diff --git a/frappe/templates/emails/auto_email_report.html b/frappe/templates/emails/auto_email_report.html index 035c3f40ee..d31ff3e62d 100644 --- a/frappe/templates/emails/auto_email_report.html +++ b/frappe/templates/emails/auto_email_report.html @@ -20,7 +20,7 @@