From 7f12d2b05319973a0ea8d1a820bdf4f312a80564 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Mon, 3 May 2021 15:16:24 +0530 Subject: [PATCH 1/2] fix: Error while exporting reports with duration field (cherry picked from commit eafadcca47dc7b900dae31c33dfb092065c65b02) --- frappe/desk/query_report.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py index 9589507ca6..8b35a8c4f2 100644 --- a/frappe/desk/query_report.py +++ b/frappe/desk/query_report.py @@ -377,7 +377,11 @@ def handle_duration_fieldtype_values(result, columns): if fieldtype == "Duration": for entry in range(0, len(result)): - val_in_seconds = result[entry][i] + row = result[entry] + if isinstance(row, dict): + val_in_seconds = row[col.fieldname] + else: + val_in_seconds = row[entry][i] if val_in_seconds: duration_val = format_duration(val_in_seconds) result[entry][i] = duration_val From 1fdafc43a40066b7aabe434cd1f98140e811212a Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Mon, 3 May 2021 15:35:46 +0530 Subject: [PATCH 2/2] fix: Errors (cherry picked from commit 4e4e0fa3d93f2d242a02f929f905b4ca6d816a70) --- frappe/desk/query_report.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py index 8b35a8c4f2..befaf7b01f 100644 --- a/frappe/desk/query_report.py +++ b/frappe/desk/query_report.py @@ -380,11 +380,14 @@ def handle_duration_fieldtype_values(result, columns): row = result[entry] if isinstance(row, dict): val_in_seconds = row[col.fieldname] + if val_in_seconds: + duration_val = format_duration(val_in_seconds) + row[col.fieldname] = duration_val else: - val_in_seconds = row[entry][i] - if val_in_seconds: - duration_val = format_duration(val_in_seconds) - result[entry][i] = duration_val + val_in_seconds = row[i] + if val_in_seconds: + duration_val = format_duration(val_in_seconds) + row[i] = duration_val return result