From 52400ab62651a38c3180b7b2eee3850986957b5c Mon Sep 17 00:00:00 2001
From: ivanm <ivanm@verdnatura.es>
Date: Mon, 20 May 2024 15:17:41 +0200
Subject: [PATCH 1/2] refs #7393 Modify night ticket closing report

---
 modules/ticket/back/methods/ticket/closeAll.js           | 9 ++++++---
 .../invoice-ticket-closure/invoice-ticket-closure.html   | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/ticket/back/methods/ticket/closeAll.js b/modules/ticket/back/methods/ticket/closeAll.js
index e3cbc83e2..d38cee491 100644
--- a/modules/ticket/back/methods/ticket/closeAll.js
+++ b/modules/ticket/back/methods/ticket/closeAll.js
@@ -71,7 +71,8 @@ module.exports = Self => {
                 JSON_ARRAYAGG(
                     JSON_OBJECT(
                         'ticketId', ticketFk,
-                        'reason', reason
+                        'reason', reason,
+                        'clientId', clientFk
                     )
                 )
             )errors
@@ -83,7 +84,8 @@ module.exports = Self => {
                             IF(hasErrorDeleted, 'Eliminado', NULL),
                             IF(hasErrorItemTaxCountry, 'Impuesto no informado', NULL),
                             IF(hasErrorAddress, 'Sin dirección', NULL),
-                            IF(hasErrorInfoTaxAreaWorld, 'Datos exportaciones', NULL)) reason
+                            IF(hasErrorInfoTaxAreaWorld, 'Datos exportaciones', NULL)) reason,
+                        clientFk
                     FROM (
                         SELECT t.id ticketFk,
                                 SUM(NOT c.hasToInvoice) hasErrorToInvoice,
@@ -93,7 +95,8 @@ module.exports = Self => {
                                 SUM(a.id IS NULL) hasErrorAddress,
                                 SUM(ios.code IS NOT NULL 
                                     AND(ad.customsAgentFk IS NULL 
-                                        OR ad.incotermsFk IS NULL)) hasErrorInfoTaxAreaWorld
+                                        OR ad.incotermsFk IS NULL)) hasErrorInfoTaxAreaWorld,
+                                t.clientFk clientFk
                             FROM ticket t
                                 LEFT JOIN address ad ON ad.id = t.addressFk
                                 JOIN sale s ON s.ticketFk = t.id
diff --git a/print/templates/email/invoice-ticket-closure/invoice-ticket-closure.html b/print/templates/email/invoice-ticket-closure/invoice-ticket-closure.html
index 2effa8917..f72b2177f 100644
--- a/print/templates/email/invoice-ticket-closure/invoice-ticket-closure.html
+++ b/print/templates/email/invoice-ticket-closure/invoice-ticket-closure.html
@@ -7,6 +7,7 @@
         <div v-for="ticket in tickets" class="grid-block vn-px-ml">
             <p v-if="ticket.ticketId"><b>{{ $t('ticketId') }}:</b> {{ticket.ticketId}}</p>
             <p v-if="ticket.reason"><b>{{ $t('reason') }}:</b> {{ticket.reason}}</p>
+            <p v-if="ticket.clientId"><b>{{ $t('clientId')}}</b>{{ticket.clientId}}</p>
             <hr>
         </div>
     </div>
-- 
2.40.1


From 03227d5e511928bab3b98b7c98b6aa7d284ec1c9 Mon Sep 17 00:00:00 2001
From: ivanm <ivanm@verdnatura.es>
Date: Thu, 18 Jul 2024 14:49:40 +0200
Subject: [PATCH 2/2] refs #7393 do the translations

---
 print/templates/email/invoice-ticket-closure/locale/en.yml | 3 ++-
 print/templates/email/invoice-ticket-closure/locale/es.yml | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/print/templates/email/invoice-ticket-closure/locale/en.yml b/print/templates/email/invoice-ticket-closure/locale/en.yml
index fef73d23f..34f31c8e3 100644
--- a/print/templates/email/invoice-ticket-closure/locale/en.yml
+++ b/print/templates/email/invoice-ticket-closure/locale/en.yml
@@ -1,4 +1,5 @@
 subject: Nightly ticket closing process report
 title: Nightly ticket closing process report
 reason: Reason
-ticketId: Ticket 
\ No newline at end of file
+ticketId: Ticket
+clientId: Client
\ No newline at end of file
diff --git a/print/templates/email/invoice-ticket-closure/locale/es.yml b/print/templates/email/invoice-ticket-closure/locale/es.yml
index 7d146b83d..a87311114 100644
--- a/print/templates/email/invoice-ticket-closure/locale/es.yml
+++ b/print/templates/email/invoice-ticket-closure/locale/es.yml
@@ -1,4 +1,5 @@
 subject: Informe proceso de cierre de tickets nocturno
 title: Informe proceso de cierre de tickets nocturno
 reason: Motivo
-ticketId: Ticket
\ No newline at end of file
+ticketId: Ticket
+clientId: Cliente
\ No newline at end of file
-- 
2.40.1