Merge pull request 'MASTER_hotfix_invoiceOut' (!1197) from MASTER_hotfix_invoiceOut into master

Reviewed-on: #1197

modules/invoiceOut/back/methods/invoiceOut/invoiceClient.js

@@ -138,7 +138,7 @@ module.exports = Self => {
             recipient: invoiceOut.client().email
         };
         try {
-            await models.InvoiceOut.invoiceEmail(ctx);
+            await models.InvoiceOut.invoiceEmail(ctx, invoiceOut.ref);
         } catch (err) {}
 
         return invoiceId;

print/templates/reports/invoice/invoice.js

@@ -82,7 +82,7 @@ module.exports = {
             return this.rawSqlFromDef(`taxes`, [reference]);
         },
         fetchIntrastat(reference) {
-            return this.rawSqlFromDef(`intrastat`, [reference, reference, reference, reference]);
+            return this.rawSqlFromDef(`intrastat`, [reference, reference, reference, reference, reference]);
         },
         fetchRectified(reference) {
             return this.rawSqlFromDef(`rectified`, [reference]);

print/templates/reports/invoice/sql/intrastat.sql

@@ -1,4 +1,9 @@
-(SELECT   
+SELECT *
+	FROM invoiceOut io
+		JOIN invoiceOutSerial ios ON io.serial = ios.code
+		JOIN
+		(SELECT
+			t.refFk,
 		    ir.id code,
 		    ir.description description,
 		    CAST(SUM(IFNULL(i.stems, 1) * s.quantity) AS DECIMAL(10,2)) stems,
@@ -19,14 +24,16 @@
 		        WHERE t.refFk = ?
 		            AND i.intrastatFk
 		        GROUP BY i.intrastatFk
-        ORDER BY i.intrastatFk)
-UNION ALL
-(SELECT
+		UNION ALL
+		SELECT
+			NULL AS refFk,
 		    NULL AS code,
 		    NULL AS description,
 		    0 AS stems,
 		    0 AS netKg,
-    CAST(SUM((ts.quantity * ts.price)) AS DECIMAL(10,2)) AS subtotal
+		    IF(CAST(SUM((ts.quantity * ts.price)) AS DECIMAL(10,2)), CAST(SUM((ts.quantity * ts.price)) AS DECIMAL(10,2)), 0) AS subtotal
 		    FROM vn.ticketService ts
 		        JOIN vn.ticket t ON ts.ticketFk = t.id
-    WHERE t.refFk = ?);
+		    WHERE t.refFk = ?) sub
+	WHERE io.`ref` = ? AND ios.isCEE
+	ORDER BY sub.code;