From 2495f06aba9c4da718c9e836705a7dede4ab39e6 Mon Sep 17 00:00:00 2001
From: Makarand Bauskar <mbauskar@gmail.com>
Date: Thu, 7 Sep 2017 20:00:00 +0530
Subject: [PATCH] [hotfix] fixes for UnicodeDecodeError: 'ascii' codec can't
 decode byte 0xc3 in position 17: ordinal not in range(128) (#4082)

* [hotfix] fixes for UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 17: ordinal not in range(128)

* [hotfix] datetime field filters issue
---
 frappe/desk/reportview.py                         | 2 +-
 frappe/public/js/frappe/form/controls/date.js     | 3 ++-
 frappe/public/js/frappe/form/controls/datetime.js | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py
index 729c8ee410..1ae010fd8e 100644
--- a/frappe/desk/reportview.py
+++ b/frappe/desk/reportview.py
@@ -153,7 +153,7 @@ def export_query():
 		for r in data:
 			# encode only unicode type strings and not int, floats etc.
 			writer.writerow(map(lambda v: isinstance(v, string_types) and
-				handle_html(v.encode('utf-8')) or v, r))
+				handle_html(frappe.as_unicode(v)) or v, r))
 
 		f.seek(0)
 		frappe.response['result'] = text_type(f.read(), 'utf-8')
diff --git a/frappe/public/js/frappe/form/controls/date.js b/frappe/public/js/frappe/form/controls/date.js
index fcb417d7f7..9102e6185a 100644
--- a/frappe/public/js/frappe/form/controls/date.js
+++ b/frappe/public/js/frappe/form/controls/date.js
@@ -16,7 +16,7 @@ frappe.ui.form.ControlDate = frappe.ui.form.ControlData.extend({
 				// if date is selected but different from value, refresh
 				const selected_date =
 					moment(this.datepicker.selectedDates[0])
-						.format(moment.defaultDateFormat);
+						.format(this.date_format);
 				should_refresh = selected_date !== value;
 			} else {
 				// if datepicker has no selected date, refresh
@@ -35,6 +35,7 @@ frappe.ui.form.ControlDate = frappe.ui.form.ControlData.extend({
 			lang = 'en';
 		}
 		this.today_text = __("Today");
+		this.date_format = moment.defaultDateFormat;
 		this.datepicker_options = {
 			language: lang,
 			autoClose: true,
diff --git a/frappe/public/js/frappe/form/controls/datetime.js b/frappe/public/js/frappe/form/controls/datetime.js
index cffbe42f9d..4289477ceb 100644
--- a/frappe/public/js/frappe/form/controls/datetime.js
+++ b/frappe/public/js/frappe/form/controls/datetime.js
@@ -2,6 +2,7 @@ frappe.ui.form.ControlDatetime = frappe.ui.form.ControlDate.extend({
 	set_date_options: function() {
 		this._super();
 		this.today_text = __("Now");
+		this.date_format = moment.defaultDatetimeFormat;
 		$.extend(this.datepicker_options, {
 			timepicker: true,
 			timeFormat: "hh:ii:ss",