Merge branch 'dev'

bin/backend/controls/Comments.html

@@ -30,7 +30,7 @@
         </span>
         <div class="quiqqer-erp-comments-comment-data">
             <span class="quiqqer-erp-comments-comment-time">{{time}}</span>
-            <span class="quiqqer-erp-comments-comment-message">{{message}}</span>
+            <span class="quiqqer-erp-comments-comment-message">{{{message}}}</span>
         </div>
     </div>
     {{/data}}

bin/backend/payment-status.css

+.processing-status,
+.payment-status,
+.payment-status-0,
+.payment-status-1,
+.payment-status-2,
+    /*.payment-status-3,*/
+.payment-status-4,
+    /*.payment-status-5,*/
+.payment-status-11,
+.payment-status-12 {
+    border-width: 1px;
+    border-style: solid;
+    padding: 2px 5px;
+    text-transform: uppercase;
+}
+
+.payment-status-0 {
+    border-color: blue;
+    color: blue;
+}
+
+.payment-status-1 {
+    border-color: green;
+    color: green;
+}
+
+.payment-status-2 {
+    border-color: orange;
+    color: orange;
+}
+
+.payment-status-3 {
+    text-decoration: line-through;
+}
+
+.payment-status-4 {
+    border-color: red;
+    color: red;
+}
+
+.payment-status-5 {
+
+}
+
+.payment-status-11 {
+    border-color: purple;
+    color: purple;
+}
+
+.payment-status-12 {
+    border-color: #004e5a;
+    color: #004e5a;
+}

src/QUI/ERP/Comments.php

@@ -121,7 +121,12 @@ public function addComment(
             $id = QUI\Utils\Uuid::get();
         }
 
-        $message = QUI\Utils\Security\Orthos::clearFormRequest($message);
+        $message = \strip_tags(
+            $message,
+            '<div><span><pre><p><br><hr>
+            <ul><ol><li><dl><dt><dd><strong><em><b><i><u>
+            <img><table><tbody><td><tfoot><th><thead><tr>'
+        );
 
         $this->comments[] = [
             'message'    => $message,

src/QUI/ERP/User.php

@@ -315,7 +315,7 @@ public function getLang()
     }
 
     /**
-     * @return mixed
+     * @return QUI\Locale
      */
     public function getLocale()
     {