From b00de586cf807f1bfc3065a2dac9d2a34ea275b9 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 28 Jan 2020 16:26:44 +0530
Subject: [PATCH] fix: Support JS Date in frappe.format

---
 utils/format.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/utils/format.js b/utils/format.js
index 0fcb7336..5f1a1537 100644
--- a/utils/format.js
+++ b/utils/format.js
@@ -25,7 +25,15 @@ module.exports = {
         dateFormat = frappe.SystemSettings.dateFormat;
       }
 
-      value = luxon.DateTime.fromISO(value).toFormat(dateFormat);
+      if (typeof value === 'string') {
+        // ISO String
+        value = luxon.DateTime.fromISO(value);
+      } else if (Object.prototype.toString.call(value) === '[object Date]') {
+        // JS Date
+        value = luxon.DateTime.fromJSDate(value);
+      }
+
+      value = value.toFormat(dateFormat);
       if (value === 'Invalid DateTime') {
         value = '';
       }