From 83b9680318700fab2f60f7f81f1e96125ad78f56 Mon Sep 17 00:00:00 2001 From: ljain112 Date: Tue, 19 Nov 2024 12:38:34 +0530 Subject: [PATCH] fix: disable conversion to user tz for sales order calender (cherry picked from commit cdf098c1939b4811da003d663f475c0c1d4d4899) --- erpnext/selling/doctype/sales_order/sales_order.py | 5 ++++- erpnext/selling/doctype/sales_order/sales_order_calendar.js | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 88528d7178f..d8b3f3c6dcf 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -1230,7 +1230,10 @@ def get_events(start, end, filters=None): """, {"start": start, "end": end}, as_dict=True, - update={"allDay": 0}, + update={ + "allDay": 0, + "convertToUserTz": 0, + }, ) return data diff --git a/erpnext/selling/doctype/sales_order/sales_order_calendar.js b/erpnext/selling/doctype/sales_order/sales_order_calendar.js index f4c0e2ba72a..59a32bde7a3 100644 --- a/erpnext/selling/doctype/sales_order/sales_order_calendar.js +++ b/erpnext/selling/doctype/sales_order/sales_order_calendar.js @@ -8,6 +8,7 @@ frappe.views.calendar["Sales Order"] = { id: "name", title: "customer_name", allDay: "allDay", + convertToUserTz: "convertToUserTz", }, gantt: true, filters: [