Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6125-roleCreditLimit

Merge pull request 'refs #5971 change sql address' (!1882 ) from 5971-addressInvoiceOut into dev
Reviewed-on: #1882 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-12-12 11:55:29 +01:00 · 2023-12-12 10:41:57 +00:00 · 2023-12-12 10:36:59 +00:00 · 2023-12-11 07:07:45 +00:00 · 2023-12-07 13:47:07 +01:00
2 changed files with 8 additions and 1 deletions
--- 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>
--- 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
Author	SHA1	Message	Date
David Domenech	6b96fe5b65	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6125-roleCreditLimit gitea/salix/pipeline/head There was a failure building this commit Details	2023-12-12 11:55:29 +01:00
Carlos Satorres	977184f3e5	Merge pull request 'refs #5971 change sql address' (!1882 ) from 5971-addressInvoiceOut into dev gitea/salix/pipeline/head This commit looks good Details Reviewed-on: #1882 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-12-12 10:41:57 +00:00
Carlos Satorres	f796227120	Merge branch 'dev' into 5971-addressInvoiceOut gitea/salix/pipeline/head This commit looks good Details	2023-12-12 10:36:59 +00:00
Carlos Satorres	9165995ee5	Merge branch 'dev' into 5971-addressInvoiceOut gitea/salix/pipeline/head This commit looks good Details	2023-12-11 07:07:45 +00:00
Carlos Satorres	7e9134ecc3	refs #5971 change sql address gitea/salix/pipeline/head This commit looks good Details	2023-12-07 13:47:07 +01:00