From 6a5e6ed2fff6554a4d5032b3240833a783a11922 Mon Sep 17 00:00:00 2001
From: Zlash65 <zarrar65@gmail.com>
Date: Mon, 1 Oct 2018 17:28:42 +0530
Subject: [PATCH] delivery trip notification to customer fix

---
 erpnext/stock/doctype/delivery_trip/delivery_trip.py        | 6 +++++-
 .../delivery_trip/dispatch_notification_template.html       | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/erpnext/stock/doctype/delivery_trip/delivery_trip.py b/erpnext/stock/doctype/delivery_trip/delivery_trip.py
index e932b1414f..424411e24a 100644
--- a/erpnext/stock/doctype/delivery_trip/delivery_trip.py
+++ b/erpnext/stock/doctype/delivery_trip/delivery_trip.py
@@ -10,7 +10,7 @@ import frappe
 from frappe import _
 from frappe.contacts.doctype.address.address import get_address_display
 from frappe.model.document import Document
-from frappe.utils import get_datetime, get_link_to_form
+from frappe.utils import get_datetime, get_link_to_form, cstr
 
 
 class DeliveryTrip(Document):
@@ -172,6 +172,10 @@ def notify_customers(delivery_trip):
 	delivery_trip = frappe.get_doc("Delivery Trip", delivery_trip)
 
 	context = delivery_trip.as_dict()
+	context.update({
+		"departure_time": cstr(context.get("departure_time")),
+		"estimated_arrival": cstr(context.get("estimated_arrival"))
+	})
 
 	if delivery_trip.driver:
 		context.update(frappe.db.get_value("Driver", delivery_trip.driver, "cell_number", as_dict=1))
diff --git a/erpnext/stock/doctype/delivery_trip/dispatch_notification_template.html b/erpnext/stock/doctype/delivery_trip/dispatch_notification_template.html
index 90a5c50eb1..9c062bc34c 100644
--- a/erpnext/stock/doctype/delivery_trip/dispatch_notification_template.html
+++ b/erpnext/stock/doctype/delivery_trip/dispatch_notification_template.html
@@ -28,11 +28,11 @@
         </tr>
         <tr>
             <td>Departure Time</td>
-            <td>{{ cstr(departure_time) }}</td>
+            <td>{{ departure_time }}</td>
         </tr>
         <tr>
             <td>Estimated Arrival</td>
-            <td>{{ cstr(estimated_arrival) }}</td>
+            <td>{{ estimated_arrival }}</td>
         </tr>
         <tr>
             <td>Driver's Name</td>