Merge branch 'next' into 'master'

Next

See merge request !51

composer.json

@@ -23,9 +23,9 @@
     "quiqqer/core": "^2",
     "quiqqer/erp": "^3.2",
     "quiqqer/customer": "^2",
-    "quiqqer/payments": "^2",
+    "quiqqer/payments": "^3",
     "quiqqer/payment-transactions": "^2",
-    "quiqqer/htmltopdf": "^2",
+    "quiqqer/htmltopdf": "^3",
     "quiqqer/utils": "^2",
     "ramsey/uuid": "^3|^4",
     "chillerlan/php-qrcode": "^4.3"

src/QUI/ERP/Accounting/Invoice/Invoice.php

@@ -26,6 +26,7 @@
 use function class_exists;
 use function date;
 use function is_array;
+use function is_numeric;
 use function is_string;
 use function json_decode;
 use function json_encode;
@@ -397,8 +398,7 @@ public function getCustomer(): QUI\ERP\User
      */
     public function getEditor(): QUI\ERP\User
     {
-        return new QUI\ERP\User([
-            'id' => $this->getAttribute('editor_id'),
+        $params = [
             'country' => '',
             'username' => '',
             'firstname' => '',
@@ -406,7 +406,17 @@ public function getEditor(): QUI\ERP\User
             'lang' => '',
             'isCompany' => '',
             'isNetto' => ''
-        ]);
+        ];
+
+        if (is_numeric($this->getAttribute('editor_id'))) {
+            $params['id'] = $this->getAttribute('editor_id');
+        }
+
+        if (is_string($this->getAttribute('editor_id'))) {
+            $params['uuid'] = $this->getAttribute('editor_id');
+        }
+
+        return new QUI\ERP\User($params);
     }
 
     /**