From 7e9134ecc385967ab71eb1b81a9a3ccdb9e13d59 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 7 Dec 2023 13:47:07 +0100
Subject: [PATCH 1/2] refs #5971 change sql address

---
 print/templates/reports/invoice/invoice.html    | 4 ++++
 print/templates/reports/invoice/sql/tickets.sql | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/print/templates/reports/invoice/invoice.html b/print/templates/reports/invoice/invoice.html
index 45b6c3934..af1aaa423 100644
--- a/print/templates/reports/invoice/invoice.html
+++ b/print/templates/reports/invoice/invoice.html
@@ -16,6 +16,7 @@
                                 <tr>
                                     <td class="font gray uppercase">{{$t('clientId')}}</td>
                                     <th>{{client.id}}</th>
+
                                 </tr>
                                 <tr>
                                     <td class="font gray uppercase">{{$t('invoice')}}</td>
@@ -80,6 +81,9 @@
                             <span>{{formatDate(ticket.shipped, '%d-%m-%Y')}}</span>
                         </div>
                     </div>
+                    <span class="pull-right">
+                        <h2>{{ticket.street}}</h2>
+                    </span>
                     <span id="nickname" class="pull-right">
                         <h2>{{ticket.nickname}}</h2>
                     </span>
diff --git a/print/templates/reports/invoice/sql/tickets.sql b/print/templates/reports/invoice/sql/tickets.sql
index a8385599c..35828c5de 100644
--- a/print/templates/reports/invoice/sql/tickets.sql
+++ b/print/templates/reports/invoice/sql/tickets.sql
@@ -2,9 +2,12 @@ SELECT
     t.id,
     t.shipped,
     t.nickname,
-    tto.description
+    tto.description,
+    t.addressFk,
+    a.street
 FROM invoiceOut io
     JOIN ticket t ON t.refFk = io.REF
+    JOIN `address` a ON a.id = t.addressFk
     LEFT JOIN observationType ot ON ot.code = 'invoiceOut'
     LEFT JOIN ticketObservation tto ON tto.ticketFk = t.id
         AND tto.observationTypeFk = ot.id

From ea39f8b3be10e0f92c143d398a21bdfb82463739 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 12 Dec 2023 12:25:51 +0100
Subject: [PATCH 2/2] remove duplicate

---
 db/dump/fixtures.sql | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql
index f422dcb45..3354e95c2 100644
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@@ -5,10 +5,6 @@ SET DEFAULT ROLE 'salix' FOR 'root'@'%';
 CREATE SCHEMA IF NOT EXISTS `vn2008`;
 CREATE SCHEMA IF NOT EXISTS `tmp`;
 
-CREATE ROLE 'salix';
-GRANT 'salix' TO 'root'@'%';
-SET DEFAULT ROLE 'salix' FOR 'root'@'%';
-
 UPDATE `util`.`config`
     SET `environment`= 'development';