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

fix: correctly check if translation of unit exists

See merge request !152

composer.json

@@ -22,7 +22,6 @@
         "php": "^8",
         "quiqqer/core": "^2",
         "quiqqer/utils": "^2",
-        "quiqqer/watcher": "^2",
         "quiqqer/translator": "^2",
         "quiqqer/employee": "^2",
         "quiqqer/customer": "^2",
@@ -32,6 +31,9 @@
         "quiqqer/erp-accounting-templates": "^2",
         "quiqqer/areas": "^2"
     },
+    "suggest": {
+        "quiqqer/watcher": "QUIQQER Watcher module (kind of logger)"
+    },
     "autoload": {
         "psr-4": {
             "QUI\\ERP\\": "src/QUI/ERP"

src/QUI/ERP/Accounting/Article.php

@@ -567,7 +567,7 @@ public function getQuantityUnit(QUI\Locale $Locale = null): string
             if (isset($options['entries'][$unitId])) {
                 $titles = $options['entries'][$unitId]['title'];
 
-                if ($titles[$current]) {
+                if (!empty($titles[$current])) {
                     return $titles[$current];
                 }
             }

src/QUI/ERP/Defaults.php

@@ -201,7 +201,7 @@ public static function getTimestampFormat(bool|string $lang = false): int|string
             return self::$timestampFormat[$lang];
         }
 
-        self::$timestampFormat[$lang] = '%c';
+        self::$timestampFormat[$lang] = 'MMM dd, yyyy, hh:mm:ss';
 
         try {
             $Package = QUI::getPackage('quiqqer/erp');
@@ -237,7 +237,7 @@ public static function getDateFormat(bool|string $lang = false): string
             return self::$dateFormat[$lang];
         }
 
-        self::$dateFormat[$lang] = '%D';
+        self::$dateFormat[$lang] = 'MMM dd, yyyy';
 
         try {
             $Package = QUI::getPackage('quiqqer/erp');
@@ -249,6 +249,7 @@ public static function getDateFormat(bool|string $lang = false): string
         }
 
         $value = $Config->get('dateFormat', $lang);
+        $value = trim($value);
 
         if (!empty($value)) {
             self::$dateFormat[$lang] = $value;