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

adding time to total_row in reports (#5961)

Browse source 
* allow null when time field is not required

* Update base_document.py

* adding time to total_row
This commit is contained in:
Mohamed_Alsum 2018-08-13 07:01:38 +02:00 • committed by Rushabh Mehta
parent bf6e589e44
commit 364b09e3d6
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
frappe/desk/query_report.py
View file

@ -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]