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

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

See merge request !182

src/QUI/ERP/Address.php

@@ -62,6 +62,11 @@ public function getDisplay(array $options = []): string
 
         if ($this->User && $this->User->isCompany()) {
             $isCompany = $this->User->isCompany();
+        } elseif (
+            !empty($this->getAttribute('isCompany'))
+            && !empty($this->getAttribute('company'))
+        ) {
+            $isCompany = true;
         }
 
         if (!empty($this->getAttribute('contactPerson'))) {