Merge branch 'main' into 'next-3.x'

Update 'next-3.x' with latest changes from 'main'

See merge request !58

src/QUI/ERP/Currency/Handler.php

@@ -603,8 +603,12 @@ public static function getRuntimeCurrency(): Currency
         }
 
         if (QUI::isFrontend()) {
-            self::$RuntimeCurrency = self::getUserCurrency(QUI::getUserBySession());
-            return self::$RuntimeCurrency;
+            $Currency = self::getUserCurrency(QUI::getUserBySession());
+
+            if ($Currency) {
+                self::$RuntimeCurrency = $Currency;
+                return self::$RuntimeCurrency;
+            }
         }
 
         return self::getDefaultCurrency();