From b4fdacaa4bfd0f149d834b537beef3670c8c0c7b Mon Sep 17 00:00:00 2001
From: vicent <vicent@verdnatura.es>
Date: Wed, 14 Dec 2022 13:16:26 +0100
Subject: [PATCH] =?UTF-8?q?feat:=20a=C3=B1adido=20UNION=20ALL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reports/invoice/sql/intrastat.sql         | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/print/templates/reports/invoice/sql/intrastat.sql b/print/templates/reports/invoice/sql/intrastat.sql
index c9e419b77..b277bf0a2 100644
--- a/print/templates/reports/invoice/sql/intrastat.sql
+++ b/print/templates/reports/invoice/sql/intrastat.sql
@@ -3,8 +3,18 @@ SELECT  ir.id code,
         iii.stems,
         iii.net netKg,
         iii.amount subtotal
-    FROM invoiceInIntrastat iii
-        LEFT JOIN invoiceIn ii ON ii.id = iii.invoiceInFk
-        LEFT JOIN invoiceOut io ON io.ref = ii.supplierRef
-        LEFT JOIN intrastat ir ON ir.id = iii.intrastatFk
-    WHERE io.`ref` = ?;
+    FROM vn.invoiceInIntrastat iii
+        LEFT JOIN vn.invoiceIn ii ON ii.id = iii.invoiceInFk
+        LEFT JOIN vn.invoiceOut io ON io.ref = ii.supplierRef
+        LEFT JOIN vn.intrastat ir ON ir.id = iii.intrastatFk
+    WHERE io.`ref` = ?
+UNION ALL
+SELECT  NULL code,
+        'Servicios' description,
+        0 stems,
+        0 netKg,
+        IF(CAST(SUM((ts.quantity * ts.price)) AS DECIMAL(10,2)), CAST(SUM((ts.quantity * ts.price)) AS DECIMAL(10,2)), 0) subtotal
+    FROM vn.ticketService ts
+        JOIN vn.ticket t ON ts.ticketFk = t.id
+    WHERE t.refFk =  ?
+    ORDER BY code;