Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4825-intrastat

db/changes/225001/.gitkeep

@@ -1 +0,0 @@
-Delete this file

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;

modules/supplier/front/agency-term/create/index.html

@@ -26,6 +26,7 @@
                 type="number"
                 label="Minimum M3"
                 ng-model="$ctrl.supplierAgencyTerm.minimumM3"
+                step="0.01"
                 rule>
             </vn-input-number>
         </vn-horizontal>
@@ -46,6 +47,7 @@
                 type="number"
                 label="M3 Price"
                 ng-model="$ctrl.supplierAgencyTerm.m3Price"
+                step="0.01"
                 rule>
             </vn-input-number>
         </vn-horizontal>

modules/ticket/back/methods/ticket/componentUpdate.js

@@ -137,7 +137,7 @@ module.exports = Self => {
                 const params = [args.id, args.shipped, args.warehouseFk];
                 const [salesMovable] = await Self.rawSql(query, params, myOptions);
 
-                const sales = await models.Sale.find({ticketFk: args.id}, myOptions);
+                const sales = await models.Sale.find({where: {ticketFk: args.id}}, myOptions);
                 const salesNewTicket = salesMovable.filter(sale => (sale.movable ? sale.movable : 0) >= sale.quantity);
 
                 const salesNewTicketLength = salesNewTicket.length;

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 *
+	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,
@@ -10,6 +15,7 @@
 		        FROM vn.ticket t
 		            JOIN vn.sale s ON s.ticketFk = t.id
 		            JOIN vn.item i ON i.id = s.itemFk
+		            JOIN vn.itemCost ic ON ic.itemFk = i.id AND ic.warehouseFk = t.warehouseFk
 		            JOIN vn.intrastat ir ON ir.id = i.intrastatFk
 		            LEFT JOIN (
 		                SELECT t2.weight
@@ -20,14 +26,16 @@
 		        WHERE t.refFk = ?
 		            AND i.intrastatFk
 		        GROUP BY i.intrastatFk
-        ORDER BY i.intrastatFk)
 		UNION ALL
-(SELECT
+		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;

print/templates/reports/invoice/sql/rectified.sql

@@ -3,8 +3,8 @@ SELECT
     io.ref,
     io.issued,
     ict.description
-FROM vn.invoiceCorrection ic
+FROM invoiceOut io
-    JOIN vn.invoiceOut io ON io.id = ic.correctedFk
+    JOIN invoiceCorrection ic ON ic.correctingFk = io.id
-    JOIN vn.invoiceCorrectionType ict ON ict.id = ic.invoiceCorrectionTypeFk
+    JOIN invoiceCorrectionType ict ON ict.id = ic.invoiceCorrectionTypeFk
     LEFT JOIN ticket t ON t.refFk = io.ref
-WHERE t.refFk = ?
+WHERE io.ref = ?