diff --git a/modules/supplier/back/models/supplier.json b/modules/supplier/back/models/supplier.json index 30ed721a58..b2f867c467 100644 --- a/modules/supplier/back/models/supplier.json +++ b/modules/supplier/back/models/supplier.json @@ -160,13 +160,5 @@ "model": "SupplierAddress", "foreignKey": "supplierFk" } - }, - "acls": [ - { - "accessType": "READ", - "principalType": "ROLE", - "principalId": "$everyone", - "permission": "ALLOW" - } - ] + } } \ No newline at end of file diff --git a/print/templates/reports/invoice/invoice.html b/print/templates/reports/invoice/invoice.html index 671bb8c7f5..8b13f2a157 100644 --- a/print/templates/reports/invoice/invoice.html +++ b/print/templates/reports/invoice/invoice.html @@ -96,7 +96,7 @@
-

Shipped

+

{{$t('shipped')}}

diff --git a/print/templates/reports/invoice/sql/tickets.sql b/print/templates/reports/invoice/sql/tickets.sql index feca81ead6..7d135bd039 100644 --- a/print/templates/reports/invoice/sql/tickets.sql +++ b/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 = ? \ No newline at end of file +WHERE io.id = ? +ORDER BY t.shipped \ No newline at end of file