scheduled jobs timezone

application/Espo/Core/Job/ConfigDataProvider.php

@@ -54,4 +54,13 @@ class ConfigDataProvider
     {
         return (bool) $this->config->get('jobNoTableLocking');
     }
+
+    public function getTimeZone(): string
+    {
+        if ($this->config->get('jobForceUtc')) {
+            return 'UTC';
+        }
+
+        return $this->config->get('timeZone') ?? 'UTC';
+    }
 }

application/Espo/Core/Job/ScheduleProcessor.php

@@ -29,6 +29,7 @@
 
 namespace Espo\Core\Job;
 
+use DateTimeZone;
 use Espo\Core\Job\Preparator\Data as PreparatorData;
 use Espo\Core\ORM\EntityManager;
 use Espo\Core\Utils\DateTime as DateTimeUtil;
@@ -64,7 +65,8 @@ class ScheduleProcessor
         private QueueUtil $queueUtil,
         private ScheduleUtil $scheduleUtil,
         private PreparatorFactory $preparatorFactory,
-        private MetadataProvider $metadataProvider
+        private MetadataProvider $metadataProvider,
+        private ConfigDataProvider $configDataProvider
     ) {}
 
     public function process(): void
@@ -172,13 +174,18 @@ class ScheduleProcessor
             return null;
         }
 
+        $timeZone = $this->configDataProvider->getTimeZone();
+
         try {
-            return $cronExpression->getNextRunDate()->format(DateTimeUtil::SYSTEM_DATE_TIME_FORMAT);
+            $next = $cronExpression->getNextRunDate(timeZone: $timeZone)
+                ->setTimezone(new DateTimeZone('UTC'));
         }
         catch (Exception) {
             $this->log->error("Scheduled Job '$id': Unsupported scheduling expression '$scheduling'.");
 
             return null;
         }
+
+        return $next->format(DateTimeUtil::SYSTEM_DATE_TIME_FORMAT);
     }
 }

application/Espo/Resources/defaults/config.php

@@ -48,6 +48,7 @@ return [
     /** Interval between process runs in seconds. */
     'daemonInterval' => 10,
     'daemonProcessTimeout' => 36000,
+    'jobForceUtc' => false,
     'recordsPerPage' => 20,
     'recordsPerPageSmall' => 5,
     'recordsPerPageSelect' => 10,

application/Espo/Resources/defaults/systemConfig.php

@@ -126,6 +126,7 @@ return [
         'jobRunInParallel',
         'jobPoolConcurrencyNumber',
         'jobPeriodForActiveProcess',
+        'jobForceUtc',
         'cronMinInterval',
         'daemonInterval',
         'daemonProcessTimeout',

application/Espo/Resources/i18n/en_US/Settings.json

@@ -127,6 +127,7 @@
         "jobRunInParallel": "Jobs Run in Parallel",
         "jobMaxPortion": "Jobs Max Portion",
         "jobPoolConcurrencyNumber": "Jobs Pool Concurrency Number",
+        "jobForceUtc": "Force UTC Time Zone",
         "daemonInterval": "Daemon Interval",
         "daemonMaxProcessNumber": "Daemon Max Process Number",
         "daemonProcessTimeout": "Daemon Process Timeout",
@@ -262,6 +263,7 @@
         "jobRunInParallel": "Jobs will be executed in parallel processes.",
         "jobPoolConcurrencyNumber": "Max number of processes run simultaneously.",
         "jobMaxPortion": "Max number of jobs processed per one execution.",
+        "jobForceUtc": "Use the UTC time zone for scheduled jobs. Otherwise, the time zone set in settings will be used.",
         "daemonInterval": "Interval between process cron runs in seconds.",
         "daemonMaxProcessNumber": "Max number of cron processes run simultaneously.",
         "daemonProcessTimeout": "Max execution time (in seconds) allocated for a single cron process.",

application/Espo/Resources/layouts/Settings/jobsSettings.json

@@ -10,5 +10,10 @@
             [{"name": "daemonInterval"}, {"name": "daemonMaxProcessNumber"}],
             [{"name": "daemonProcessTimeout"}, false]
         ]
+    },
+    {
+        "rows": [
+            [{"name": "jobForceUtc"}, false]
+        ]
     }
 ]

application/Espo/Resources/metadata/entityDefs/Settings.json

@@ -748,6 +748,10 @@
             "tooltip": true,
             "min": 1
         },
+        "jobForceUtc": {
+            "type": "bool",
+            "tooltip": true
+        },
         "daemonInterval": {
             "type": "int",
             "tooltip": true

upgrades/8.2/data.json

@@ -0,0 +1,5 @@
+{
+    "manifest": {
+        "delete": []
+    }
+}

upgrades/8.2/scripts/AfterUpgrade.php

@@ -0,0 +1,48 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM – Open Source CRM application.
+ * Copyright (C) 2014-2024 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+use Espo\Core\Container;
+use Espo\Core\InjectableFactory;
+use Espo\Core\Utils\Config\ConfigWriter;
+
+/** @noinspection PhpMultipleClassDeclarationsInspection */
+class AfterUpgrade
+{
+    public function run(Container $container): void
+    {
+        $configWriter = $container->getByClass(InjectableFactory::class)
+            ->create(ConfigWriter::class);
+
+        $configWriter->setMultiple([
+            'jobForceUtc' => true,
+        ]);
+
+        $configWriter->save();
+    }
+}