From 19d19d4372346d58dc429dc899f43ef9c7980e46 Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Thu, 19 Mar 2026 20:02:50 -0400
Subject: [PATCH] Fix timezone handling on form saves of date fields (CFM-509)

---
 app/src/View/Helper/FieldHelper.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/View/Helper/FieldHelper.php b/app/src/View/Helper/FieldHelper.php
index 6a09398f0..11d4fb258 100644
--- a/app/src/View/Helper/FieldHelper.php
+++ b/app/src/View/Helper/FieldHelper.php
@@ -348,6 +348,10 @@ public function dateField(string $fieldName,
     // Get the existing values, if present
     if($date_object !== null) {
       // Adjust the time back to the user's timezone
+      $tz = $this->getView()->get('vv_tz');
+      if($tz) {
+        $date_object = $date_object->setTimezone($tz);
+      }
       $coptions['value'] = $date_object->i18nFormat($dateFormat);
       $pickerDate = $date_object->i18nFormat($dateFormat);
     }