Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 7524-hotfix-addNoLimit

db/routines/vn/functions/invoiceSerial.sql

@@ -1,18 +1,23 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`invoiceSerial`(vClientFk INT, vCompanyFk INT, vType CHAR(15))
+CREATE OR REPLACE DEFINER=`root`@`localhost` FUNCTION `vn`.`invoiceSerial`(
+	vClientFk INT,
+	vCompanyFk INT,
+	vType CHAR(15)
+)
 	RETURNS char(2) CHARSET utf8mb3 COLLATE utf8mb3_general_ci
 	DETERMINISTIC
 BEGIN
-	/**
-	* Obtiene la serie de una factura
-	* dependiendo del area del cliente.
-	*
-	* @param vClientFk Id del cliente
-	* @param vCompanyFk Id de la empresa
-	* @param vType Tipo de factura ['global','multiple','quick']
-	* @return vSerie de la factura
-	*/
+/**
+* Obtiene la serie de una factura
+* dependiendo del area del cliente.
+*
+* @param vClientFk Id del cliente
+* @param vCompanyFk Id de la empresa
+* @param vType Tipo de factura (vn.invoiceOutSerial.type[ENUM])
+* @return vSerie de la factura
+*/
 	DECLARE vTaxArea VARCHAR(25) COLLATE utf8mb3_general_ci;
+	DECLARE vTransactionCode INT(2);
 	DECLARE vSerie CHAR(2);
 
 	IF (SELECT hasInvoiceSimplified FROM client WHERE id = vClientFk) THEN
@@ -23,9 +28,15 @@ BEGIN
 		FROM client
 		WHERE id = vClientFk;
 
-	SELECT code INTO vSerie
-		FROM invoiceOutSerial
-		WHERE `type` = vType AND taxAreaFk = vTaxArea;
+	SELECT CodigoTransaccion INTO vTransactionCode
+		FROM taxArea
+		WHERE code = vTaxArea;
+
+	SELECT ios.code INTO vSerie
+		FROM invoiceOutSerial ios
+			JOIN taxArea ta ON ta.code = ios.taxAreaFk
+		WHERE ios.`type` = vType
+			AND ta.CodigoTransaccion = vTransactionCode;
 
 	RETURN vSerie;
 END$$

db/routines/vn/procedures/sale_getProblems.sql

@@ -23,13 +23,6 @@ BEGIN
 
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
 
-	DELETE tt.*
-		FROM tmp.sale_getProblems tt
-			JOIN ticketObservation tto ON tto.ticketFk = tt.ticketFk
-			JOIN observationType ot ON ot.id = tto.observationTypeFk
-		WHERE ot.code = 'administrative'
-			AND tto.description = 'Miriam';
-
 	CREATE OR REPLACE TEMPORARY TABLE tmp.sale_problems (
 		ticketFk INT(11),
 		saleFk INT(11),

db/versions/11205-grayCymbidium/00-firstScript.sql

@@ -0,0 +1,2 @@
+-- Place your SQL code here
+ALTER TABLE dipole.expedition_PrintOut MODIFY COLUMN isPrinted int(11) DEFAULT 0 NOT NULL COMMENT '0.- Not Printed ; 1.- Printed; 2.- Selected ; 3.- Error ;  4.- Waiting to be printed';

modules/ticket/back/methods/ticket/closure.js

@@ -13,23 +13,20 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
     const failedtickets = [];
     for (const ticket of tickets) {
         try {
-            await Self.app.models.InvoiceOut.getSerial(ticket.clientFk, ticket.companyFk, ticket.addressFk, 'M');
+            await Self.app.models.InvoiceOut.getSerial(ticket.clientFk, ticket.companyFk, ticket.addressFk, 'multiple');
             await Self.rawSql(
                 `CALL vn.ticket_closeByTicket(?)`,
                 [ticket.id],
                 {userId}
             );
 
-            const [invoiceOut] = await Self.rawSql(
-                `
+            const [invoiceOut] = await Self.rawSql(`
                 SELECT io.id, io.ref, io.serial, cny.code companyCode, io.issued
                     FROM ticket t
                         JOIN invoiceOut io ON io.ref = t.refFk
                         JOIN company cny ON cny.id = io.companyFk
                     WHERE t.id = ?
-                `,
-                [ticket.id],
-            );
+            `, [ticket.id]);
 
             const mailOptions = {
                 overrideAttachments: true,
@@ -104,17 +101,14 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
             }
 
             // Incoterms authorization
-            const [{firstOrder}] = await Self.rawSql(
-                `
+            const [{firstOrder}] = await Self.rawSql(`
                 SELECT COUNT(*) as firstOrder
                     FROM ticket t
                         JOIN client c ON c.id = t.clientFk
                     WHERE t.clientFk = ?
                         AND NOT t.isDeleted
                         AND c.isVies
-                    `,
-                [ticket.clientFk],
-            );
+            `, [ticket.clientFk]);
 
             if (firstOrder == 1) {
                 const args = {
@@ -129,26 +123,17 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
                 const email = new Email('incoterms-authorization', args);
                 await email.send();
 
-                const [sample] = await Self.rawSql(
-                    `SELECT id
+                const [sample] = await Self.rawSql(`
+                    SELECT id
                         FROM sample
                         WHERE code = 'incoterms-authorization'
-                `,
-                );
+                `);
 
-                await Self.rawSql(
-                    `
+                await Self.rawSql(`
                     INSERT INTO clientSample (clientFk, typeFk, companyFk) VALUES(?, ?, ?)
-                `,
-                    [ticket.clientFk, sample.id, ticket.companyFk],
-                    {userId},
-                );
+                `, [ticket.clientFk, sample.id, ticket.companyFk], {userId});
             }
         } catch (error) {
-            await Self.rawSql(`
-                INSERT INTO util.debug (variable, value)
-                    VALUES ('invoicingTicketError', ?)
-            `, [ticket.id + ' - ' + error]);
             // Domain not found
             if (error.responseCode == 450) {
                 await invalidEmail(ticket);

modules/ticket/front/sale-tracking/index.html

@@ -6,16 +6,6 @@
     order="concept ASC, quantity DESC"
     auto-load="true">
 </vn-crud-model>
-<vn-crud-model
-    url="Shelvings"
-    data="shelvings"
-    auto-load="true">
-</vn-crud-model>
-<vn-crud-model
-    url="Parkings"
-    data="parkings"
-    auto-load="true">
-</vn-crud-model>
 <vn-data-viewer model="model">
     <vn-card class="vn-w-lg">
     <vn-table model="model">
@@ -208,7 +198,7 @@
                     </vn-td>
                     <vn-td expand>
                         <vn-autocomplete
-                            data="shelvings"
+                            url="Shelvings"
                             show-field="code"
                             value-field="code"
                             ng-model="itemShelvingSale.shelvingFk"
@@ -217,7 +207,7 @@
                     </vn-td>
                     <vn-td expand>
                         <vn-autocomplete
-                            data="parkings"
+                            url="Parkings"
                             show-field="code"
                             value-field="id"
                             ng-model="itemShelvingSale.parkingFk"

print/templates/reports/sepa-core/sql/supplier.sql

@@ -18,7 +18,7 @@ SELECT m.code mandateCode,
     WHERE m.companyFk = ?
         AND m.finished IS NULL
         AND c.id = ?
-        AND mt.name = 'CORE'
+        AND mt.code = 'CORE'
         AND adt.description = 'Referencia Remesas'
     GROUP BY m.id, ad.value
     ORDER BY m.created DESC