Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test

modules/supplier/back/models/supplier.json

@@ -160,13 +160,5 @@
 			"model": "SupplierAddress",
 			"foreignKey": "supplierFk"
 		}
-    },
+    }
-    "acls": [
-        {
-        "accessType": "READ",
-        "principalType": "ROLE",
-        "principalId": "$everyone",
-        "permission": "ALLOW"
-        }
-    ]
 }

print/templates/reports/invoice/invoice.html

@@ -96,7 +96,7 @@
                                             </div>
                                         </div>
                                         <div class="pull-left">
-                                            <h2>Shipped</h2>
+                                            <h2>{{$t('shipped')}}</h2>
                                         </div>
                                         <div class="pull-left">
                                             <div class="field rectangle">

print/templates/reports/invoice/sql/tickets.sql

@@ -4,4 +4,5 @@ SELECT
     t.nickname
 FROM invoiceOut io 
     JOIN ticket t ON t.refFk = io.ref
-WHERE io.id = ?
+WHERE io.id = ?
+ORDER BY t.shipped