From 4e8bab55d5d0931fdda66b574da37c96dc0e279f Mon Sep 17 00:00:00 2001 From: Makarand Bauskar Date: Tue, 11 Jul 2017 14:05:36 +0530 Subject: [PATCH] [minor] return formatted time on format_value instead of timedelta object (#3657) --- frappe/utils/formatters.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/frappe/utils/formatters.py b/frappe/utils/formatters.py index 824b5a5411..bf5a81e4f7 100644 --- a/frappe/utils/formatters.py +++ b/frappe/utils/formatters.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals import frappe import datetime -from frappe.utils import formatdate, fmt_money, flt, cstr, cint, format_datetime +from frappe.utils import formatdate, fmt_money, flt, cstr, cint, format_datetime, format_time from frappe.model.meta import get_field_currency, get_field_precision import re @@ -20,6 +20,8 @@ def format_value(value, df=None, doc=None, currency=None, translated=False): df.fieldtype = 'Datetime' elif isinstance(value, datetime.date): df.fieldtype = 'Date' + elif isinstance(value, datetime.timedelta): + df.fieldtype = 'Time' elif isinstance(value, int): df.fieldtype = 'Int' elif isinstance(value, float): @@ -45,6 +47,9 @@ def format_value(value, df=None, doc=None, currency=None, translated=False): elif df.get("fieldtype")=="Datetime": return format_datetime(value) + elif df.get("fieldtype")=="Time": + return format_time(value) + elif value==0 and df.get("fieldtype") in ("Int", "Float", "Currency", "Percent") and df.get("print_hide_if_no_value"): # this is required to show 0 as blank in table columns return ""