diff --git a/app/Factory/TransactionJournalFactory.php b/app/Factory/TransactionJournalFactory.php index 40743d9b21..0ad8ef096d 100644 --- a/app/Factory/TransactionJournalFactory.php +++ b/app/Factory/TransactionJournalFactory.php @@ -173,7 +173,8 @@ class TransactionJournalFactory $carbon->setTimezone(config('app.timezone')); // 2024-11-19, overrule timezone with UTC and store it as UTC. - if (FireflyConfig::get('utc', false)) { + + if (FireflyConfig::get('utc', false)->data) { $carbon->setTimezone('UTC'); } // $carbon->setTimezone('UTC'); diff --git a/app/Http/Middleware/Installer.php b/app/Http/Middleware/Installer.php index 8fc6ee1c77..d5844ae9e6 100644 --- a/app/Http/Middleware/Installer.php +++ b/app/Http/Middleware/Installer.php @@ -158,6 +158,10 @@ class Installer // version compare thing. $configVersion = (string)config('firefly.version'); $dbVersion = (string)app('fireflyconfig')->getFresh('ff3_version', '1.0')->data; + if(str_starts_with($configVersion, 'develop')) { + Log::debug('Skipping version check for develop version.'); + return false; + } if (1 === version_compare($configVersion, $dbVersion)) { app('log')->warning( sprintf( diff --git a/app/Services/Internal/Update/JournalUpdateService.php b/app/Services/Internal/Update/JournalUpdateService.php index d2813a350d..3488032962 100644 --- a/app/Services/Internal/Update/JournalUpdateService.php +++ b/app/Services/Internal/Update/JournalUpdateService.php @@ -489,7 +489,7 @@ class JournalUpdateService $value->setTimezone(config('app.timezone')); // 2024-11-22, overrule timezone with UTC and store it as UTC. - if (FireflyConfig::get('utc', false)) { + if (FireflyConfig::get('utc', false)->data) { $value->setTimezone('UTC'); }