From 452d9042fcc6764ceb7e4605786e3d8938865a25 Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Fri, 19 Jan 2018 18:04:53 +0530
Subject: [PATCH 1/2] [Fix] Showing today's date as communication date for old
 emails in the popup

---
 frappe/desk/form/load.py                       | 2 +-
 frappe/public/js/frappe/views/communication.js | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/frappe/desk/form/load.py b/frappe/desk/form/load.py
index b09a23cbb4..9e12de718e 100644
--- a/frappe/desk/form/load.py
+++ b/frappe/desk/form/load.py
@@ -138,7 +138,7 @@ def get_communication_data(doctype, name, start=0, limit=20, after=None, fields=
 	'''Returns list of communications for a given document'''
 	if not fields:
 		fields = '''name, communication_type,
-			communication_medium, comment_type,
+			communication_medium, comment_type, communication_date,
 			content, sender, sender_full_name, creation, subject, delivery_status, _liked_by,
 			timeline_doctype, timeline_name,
 			reference_doctype, reference_name,
diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js
index 59808efa98..695f6eb58d 100755
--- a/frappe/public/js/frappe/views/communication.js
+++ b/frappe/public/js/frappe/views/communication.js
@@ -585,12 +585,13 @@ frappe.views.CommunicationComposer = Class.extend({
 				.replace(/&lt;meta[\s\S]*meta&gt;/g, '') // remove <meta> tags
 				.replace(/&lt;style[\s\S]*&lt;\/style&gt;/g, ''); // // remove <style> tags
 
+			var communication_date = last_email.communication_date || last_email.creation;
 			content = '<div><br></div>'
 				+ reply
 				+ "<br><!-- original-reply --><br>"
 				+ '<blockquote>' +
 					'<p>' + __("On {0}, {1} wrote:",
-					[frappe.datetime.global_date_format(last_email.communication_date) , last_email.sender]) + '</p>' +
+					[frappe.datetime.global_date_format(communication_date) , last_email.sender]) + '</p>' +
 					last_email_content +
 				'<blockquote>';
 		} else {

From a18e0661dfece4f03277dbde9129ea7c080a3bfa Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh6790@gmail.com>
Date: Mon, 22 Jan 2018 16:01:03 +0600
Subject: [PATCH 2/2] bumped to version 10.0.13

---
 frappe/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index f018f4c742..d597e1e783 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
 from .exceptions import *
 from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template
 
-__version__ = '10.0.12'
+__version__ = '10.0.13'
 __title__ = "Frappe Framework"
 
 local = Local()