From 364b09e3d69ca52f7e347decdca4ccd15bb732ac Mon Sep 17 00:00:00 2001 From: Mohamed_Alsum Date: Mon, 13 Aug 2018 07:01:38 +0200 Subject: [PATCH] adding time to total_row in reports (#5961) * allow null when time field is not required * Update base_document.py * adding time to total_row --- frappe/desk/query_report.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py index b5e4b34500..d5dac14a53 100644 --- a/frappe/desk/query_report.py +++ b/frappe/desk/query_report.py @@ -15,6 +15,7 @@ import frappe.desk.reportview from frappe.utils.csvutils import read_csv_content_from_attached_file from frappe.permissions import get_role_permissions from six import string_types, iteritems +from datetime import timedelta def get_report_doc(report_name): doc = frappe.get_doc("Report", report_name) @@ -287,6 +288,12 @@ def add_total_row(result, columns, meta = None): if fieldtype == "Percent" and i not in has_percent: has_percent.append(i) + if fieldtype == "Time" and row[i]: + if not total_row[i]: + total_row[i]=timedelta(hours=0,minutes=0,seconds=0) + total_row[i] = total_row[i] + row[i] + + if fieldtype=="Link" and options == "Currency": total_row[i] = result[0][i]