Merge pull request #15551 from Zlash65/minor-fix
[Minor] Delivery trip test fix
diff --git a/erpnext/stock/doctype/delivery_trip/delivery_trip.py b/erpnext/stock/doctype/delivery_trip/delivery_trip.py
index e932b14..424411e 100644
--- a/erpnext/stock/doctype/delivery_trip/delivery_trip.py
+++ b/erpnext/stock/doctype/delivery_trip/delivery_trip.py
@@ -10,7 +10,7 @@
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 @@
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 90a5c50..9c062bc 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>
diff --git a/erpnext/stock/doctype/delivery_trip/test_delivery_trip.py b/erpnext/stock/doctype/delivery_trip/test_delivery_trip.py
index 4f7fcd8..fae03f8 100644
--- a/erpnext/stock/doctype/delivery_trip/test_delivery_trip.py
+++ b/erpnext/stock/doctype/delivery_trip/test_delivery_trip.py
@@ -9,7 +9,7 @@
import frappe
from erpnext.stock.doctype.delivery_trip.delivery_trip import get_contact_and_address, notify_customers
from erpnext.tests.utils import create_test_contact_and_address
-from frappe.utils import add_days, now_datetime
+from frappe.utils import add_days, now_datetime, nowdate
class TestDeliveryTrip(unittest.TestCase):
@@ -26,8 +26,9 @@
delivery_trip = frappe.get_doc({
"doctype": "Delivery Trip",
"company": erpnext.get_default_company(),
+ "date": add_days(nowdate(), 5),
"departure_time": add_days(now_datetime(), 5),
- "driver": "DRIVER-00001",
+ "driver": frappe.db.get_value('Driver', {"full_name": "Newton Scmander"}),
"vehicle": "JB 007",
"delivery_stops": [{
"customer": "_Test Customer",