From 23bd21778e50581c97841097762ab00c89d5295e Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Mon, 26 Oct 2015 12:43:50 +0530
Subject: [PATCH] [fix] Events in Email Digest

---
 erpnext/setup/doctype/email_digest/email_digest.py        | 2 +-
 erpnext/setup/doctype/email_digest/templates/default.html | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/erpnext/setup/doctype/email_digest/email_digest.py b/erpnext/setup/doctype/email_digest/email_digest.py
index 289a6be4e4..e2b0de0eb6 100644
--- a/erpnext/setup/doctype/email_digest/email_digest.py
+++ b/erpnext/setup/doctype/email_digest/email_digest.py
@@ -139,7 +139,7 @@ class EmailDigest(Document):
 
 		for i, e in enumerate(events):
 			e.starts_on_label = format_time(e.starts_on)
-			e.ends_on_label = format_time(e.ends_on)
+			e.ends_on_label = format_time(e.ends_on) if e.ends_on else None
 			e.date = formatdate(e.starts)
 			e.link = get_url_to_form("Event", e.name)
 
diff --git a/erpnext/setup/doctype/email_digest/templates/default.html b/erpnext/setup/doctype/email_digest/templates/default.html
index 3aad202529..d0bd13a7d4 100644
--- a/erpnext/setup/doctype/email_digest/templates/default.html
+++ b/erpnext/setup/doctype/email_digest/templates/default.html
@@ -52,6 +52,8 @@
                     <span style="{{ label_css }}">
                     {% if e.all_day %}
                         {{ _("All Day") }}
+                    {% elif (not e.ends_on_label or e.starts_on_label == e.ends_on_label)%}
+                        {{ e.starts_on_label }}
                     {% else %}
                         {{ e.starts_on_label }} - {{ e.ends_on_label }}
                     {% endif %}