From eb2c11a184ba618123e195ccd5e7b843338ae44d Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@erpnext.com>
Date: Wed, 18 Mar 2015 15:36:33 +0530
Subject: [PATCH] fixed test cases

---
 frappe/__init__.py                 | 3 ++-
 frappe/desk/doctype/event/event.py | 8 ++++++--
 frappe/model/document.py           | 4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 4623ed438b..dba5a55321 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -859,11 +859,12 @@ def get_all(doctype, *args, **kwargs):
 def add_version(doc):
 	"""Insert a new **Version** of the given document.
 	A **Version** is a JSON dump of the current document state."""
+	from frappe.utils.response import json_handler
 	get_doc({
 		"doctype": "Version",
 		"ref_doctype": doc.doctype,
 		"docname": doc.name,
-		"doclist_json": json.dumps(doc.as_dict(), indent=1, sort_keys=True)
+		"doclist_json": json.dumps(doc.as_dict(), indent=1, sort_keys=True, default=json_handler)
 	}).insert(ignore_permissions=True)
 
 def get_test_records(doctype):
diff --git a/frappe/desk/doctype/event/event.py b/frappe/desk/doctype/event/event.py
index 613b710a94..62f2029478 100644
--- a/frappe/desk/doctype/event/event.py
+++ b/frappe/desk/doctype/event/event.py
@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 
-from frappe.utils import getdate, cint, add_months, date_diff, add_days, nowdate
+from frappe.utils import getdate, cint, add_months, date_diff, add_days, nowdate, get_datetime_str
 from frappe.model.document import Document
 from frappe.utils.user import get_enabled_system_users
 
@@ -114,7 +114,11 @@ def get_events(start, end, user=None, for_reminder=False):
 
 	for e in events:
 		if e.repeat_this_event:
-			event_start, time_str = e.starts_on.split(" ")
+			e.starts_on = get_datetime_str(e.starts_on)
+			if e.ends_on:
+				e.ends_on = get_datetime_str(e.ends_on)
+
+			event_start, time_str = get_datetime_str(e.starts_on).split(" ")
 			if e.repeat_till == None or "":
 				repeat = "3000-01-01"
 			else:
diff --git a/frappe/model/document.py b/frappe/model/document.py
index c9cdf60dae..f769add5af 100644
--- a/frappe/model/document.py
+++ b/frappe/model/document.py
@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _, msgprint
-from frappe.utils import flt, cint, cstr, now
+from frappe.utils import flt, cint, cstr, now, get_datetime_str
 from frappe.model.base_document import BaseDocument, get_controller
 from frappe.model.naming import set_new_name
 from werkzeug.exceptions import NotFound, Forbidden
@@ -661,4 +661,4 @@ class Document(BaseDocument):
 
 	def get_signature(self):
 		"""Returns signature (hash) for private URL."""
-		return hashlib.sha224(self.creation).hexdigest()
+		return hashlib.sha224(get_datetime_str(self.creation)).hexdigest()