From cae69a2ce4d89b416b14c246df668477cc8aaaaf Mon Sep 17 00:00:00 2001
From: joan <joan@verdnatura.es>
Date: Fri, 12 Nov 2021 08:35:00 +0100
Subject: [PATCH 1/3] fix(invoice): order tickets by id on invoice report

---
 print/templates/reports/invoice/invoice.js      | 1 -
 print/templates/reports/invoice/sql/tickets.sql | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/print/templates/reports/invoice/invoice.js b/print/templates/reports/invoice/invoice.js
index 3e8734306..b56a5533c 100755
--- a/print/templates/reports/invoice/invoice.js
+++ b/print/templates/reports/invoice/invoice.js
@@ -95,7 +95,6 @@ module.exports = {
         },
         ticketSubtotal(ticket) {
             let subTotal = 0.00;
-            console.log(ticket.sales);
             for (let sale of ticket.sales)
                 subTotal += this.saleImport(sale);
 
diff --git a/print/templates/reports/invoice/sql/tickets.sql b/print/templates/reports/invoice/sql/tickets.sql
index feca81ead..0a243b3a7 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.id
\ No newline at end of file

From bcaa11a3c4eda06994e20be519ab52e17efc1d2a Mon Sep 17 00:00:00 2001
From: joan <joan@verdnatura.es>
Date: Fri, 12 Nov 2021 08:45:02 +0100
Subject: [PATCH 2/3] fix(invoice): order by shipped

---
 print/templates/reports/invoice/invoice.html    | 2 +-
 print/templates/reports/invoice/sql/tickets.sql | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/print/templates/reports/invoice/invoice.html b/print/templates/reports/invoice/invoice.html
index 671bb8c7f..8b13f2a15 100644
--- a/print/templates/reports/invoice/invoice.html
+++ b/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">
diff --git a/print/templates/reports/invoice/sql/tickets.sql b/print/templates/reports/invoice/sql/tickets.sql
index 0a243b3a7..7d135bd03 100644
--- a/print/templates/reports/invoice/sql/tickets.sql
+++ b/print/templates/reports/invoice/sql/tickets.sql
@@ -5,4 +5,4 @@ SELECT
 FROM invoiceOut io 
     JOIN ticket t ON t.refFk = io.ref
 WHERE io.id = ?
-ORDER BY t.id
\ No newline at end of file
+ORDER BY t.shipped
\ No newline at end of file

From 93c766e3ca4f67d89ee8b5d247c305f96e2d4404 Mon Sep 17 00:00:00 2001
From: joan <joan@verdnatura.es>
Date: Fri, 12 Nov 2021 09:32:42 +0100
Subject: [PATCH 3/3] fix(supplier): removed everyone read acl

---
 modules/supplier/back/models/supplier.json | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/modules/supplier/back/models/supplier.json b/modules/supplier/back/models/supplier.json
index 30ed721a5..b2f867c46 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