From ce266f29449ef3bbea43de671e442cb9c49ffda7 Mon Sep 17 00:00:00 2001 From: mbauskar Date: Mon, 11 Sep 2017 17:27:31 +0530 Subject: [PATCH 1/2] [minor] show the child table fields lable in Auto Email Report --- frappe/core/doctype/report/report.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/frappe/core/doctype/report/report.py b/frappe/core/doctype/report/report.py index 7c18d5fd27..0e6e1d8d1a 100644 --- a/frappe/core/doctype/report/report.py +++ b/frappe/core/doctype/report/report.py @@ -147,10 +147,13 @@ 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] From 6fd186eaa328e3b9307da8e49e80a2217277f650 Mon Sep 17 00:00:00 2001 From: mbauskar Date: Mon, 11 Sep 2017 17:55:57 +0530 Subject: [PATCH 2/2] [minor] translate field label for auto email reports --- frappe/core/doctype/report/report.py | 3 +-- frappe/email/doctype/auto_email_report/auto_email_report.py | 2 +- frappe/templates/emails/auto_email_report.html | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/frappe/core/doctype/report/report.py b/frappe/core/doctype/report/report.py index 0e6e1d8d1a..fd53fad44b 100644 --- a/frappe/core/doctype/report/report.py +++ b/frappe/core/doctype/report/report.py @@ -150,8 +150,7 @@ class Report(Document): _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])] + field = [meta.get_field(column[0]) or frappe._dict(label=meta.get_label(column[0]), fieldname=column[0])] _columns.extend(field) columns = _columns 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 @@ {% for col in columns %} - {{- col.label -}} + {{- _(col.label) -}} {% endfor %}