Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs

2023-05-04 09:59:05 +02:00 · 2023-05-04 09:59:05 +02:00 · 54eb0fc7a2
parent b3100d2653 9030aea17c
commit 54eb0fc7a2
8 changed files with 86 additions and 82 deletions
--- a/back/methods/collection/setSaleQuantity.js
+++ b/back/methods/collection/setSaleQuantity.js
@ -40,8 +40,7 @@ module.exports = Self => {
        try {
            const sale = await models.Sale.findById(saleId, null, myOptions);
            const saleUpdated = await sale.updateAttributes({
-                originalQuantity: sale.quantity,
-                quantity: quantity
+                quantity
            }, myOptions);

            if (tx) await tx.commit();
--- a/back/methods/collection/spec/setSaleQuantity.spec.js
+++ b/back/methods/collection/spec/setSaleQuantity.spec.js
@ -30,7 +30,7 @@ describe('setSaleQuantity()', () => {
            await models.Collection.setSaleQuantity(saleId, newQuantity, options);
            const updateSale = await models.Sale.findById(saleId, null, options);

-            expect(updateSale.originalQuantity).toEqual(originalSale.quantity);
+            expect(updateSale.quantity).not.toEqual(originalSale.quantity);
            expect(updateSale.quantity).toEqual(newQuantity);

            await tx.rollback();
--- a/db/.archive/225201/00-invoiceOut_new.sql
+++ b/db/.archive/225201/00-invoiceOut_new.sql
@ -8,7 +8,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `vn`.`invoiceOut_new`(
 BEGIN
 /**
 * Creación de facturas emitidas.
- * requiere previamente tabla ticketToInvoice(id).
+ * requiere previamente tabla tmp.ticketToInvoice(id).
 *
 * @param vSerial serie a la cual se hace la factura
 * @param vInvoiceDate fecha de la factura
@ -36,13 +36,13 @@ BEGIN

 	SELECT t.clientFk, t.companyFk
 			INTO vClient, vCompany
-		FROM ticketToInvoice tt
+		FROM tmp.ticketToInvoice tt
 			JOIN ticket t ON t.id = tt.id
 		LIMIT 1;

-	-- Eliminem de ticketToInvoice els tickets que no han de ser facturats
+	-- Eliminem de tmp.ticketToInvoice els tickets que no han de ser facturats
 	DELETE ti.*
-		FROM ticketToInvoice ti
+		FROM tmp.ticketToInvoice ti
 			JOIN ticket t ON t.id = ti.id
 			JOIN sale s ON s.ticketFk = t.id
 			JOIN item i ON i.id = s.itemFk
@ -57,7 +57,7 @@ BEGIN

 	SELECT SUM(s.quantity * s.price * (100 - s.discount)/100), ts.id
 			INTO vIsAnySaleToInvoice, vIsAnyServiceToInvoice
-		FROM ticketToInvoice t
+		FROM tmp.ticketToInvoice t
 			LEFT JOIN sale s ON s.ticketFk = t.id
 			LEFT JOIN ticketService ts ON ts.ticketFk = t.id;

@ -100,13 +100,13 @@ BEGIN
 			WHERE id = vNewInvoiceId;

 		UPDATE ticket t
-				JOIN ticketToInvoice ti ON ti.id = t.id
+				JOIN tmp.ticketToInvoice ti ON ti.id = t.id
 			SET t.refFk = vNewRef;

 		DROP TEMPORARY TABLE IF EXISTS tmp.updateInter;
 		CREATE TEMPORARY TABLE tmp.updateInter ENGINE = MEMORY
 			SELECT s.id,ti.id ticket_id,vWorker Id_Trabajador
-				FROM ticketToInvoice ti
+				FROM tmp.ticketToInvoice ti
 					LEFT JOIN ticketState ts ON ti.id = ts.ticket
 					JOIN state s
 				WHERE IFNULL(ts.alertLevel,0) < 3 and s.`code` = getAlert3State(ti.id);
@ -116,7 +116,7 @@ BEGIN

 		INSERT INTO ticketLog (action, userFk, originFk, description)
 			SELECT 'UPDATE', account.myUser_getId(), ti.id, CONCAT('Crea factura ', vNewRef)
-				FROM ticketToInvoice ti;
+				FROM tmp.ticketToInvoice ti;

 		CALL invoiceExpenceMake(vNewInvoiceId);
 		CALL invoiceTaxMake(vNewInvoiceId,vTaxArea);
@ -159,7 +159,7 @@ BEGIN
 				(KEY (ticketFk))
 				ENGINE = MEMORY
 				SELECT id ticketFk
-					FROM ticketToInvoice;
+					FROM tmp.ticketToInvoice;

 			CALL `ticket_getTax`('NATIONAL');

@ -220,6 +220,6 @@ BEGIN

 	END IF;

-	DROP TEMPORARY TABLE `ticketToInvoice`;
+	DROP TEMPORARY TABLE `tmp`.`ticketToInvoice`;
 END$$
 DELIMITER ;
--- a/db/changes/231001/02-invoiceOut_new.sql
+++ b/db/changes/231001/02-invoiceOut_new.sql
@ -10,14 +10,14 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`invoiceOut_new`(
 BEGIN
 /**
 * Creación de facturas emitidas.
- * requiere previamente tabla ticketToInvoice(id).
+ * requiere previamente tabla tmp.ticketToInvoice(id).
 *
 * @param vSerial serie a la cual se hace la factura
 * @param vInvoiceDate fecha de la factura
 * @param vTaxArea tipo de iva en relacion a la empresa y al cliente
 * @param vNewInvoiceId id de la factura que se acaba de generar
 * @return vNewInvoiceId
- */	
+ */
 	DECLARE vIsAnySaleToInvoice BOOL;
 	DECLARE vIsAnyServiceToInvoice BOOL;
 	DECLARE vNewRef VARCHAR(255);
@ -37,32 +37,32 @@ BEGIN
 	DECLARE vMaxShipped DATE;

 	SET vInvoiceDate = IFNULL(vInvoiceDate, util.CURDATE());
-	
-	SELECT t.clientFk, 
-			t.companyFk, 
+
+	SELECT t.clientFk,
+			t.companyFk,
 			MAX(DATE(t.shipped)),
 			DATE(vInvoiceDate) >= invoiceOut_getMaxIssued(
-				vSerial, 
-				t.companyFk, 
+				vSerial,
+				t.companyFk,
 				YEAR(vInvoiceDate))
-			INTO vClientFk, 
+			INTO vClientFk,
 				vCompanyFk,
 				vMaxShipped,
 				vIsCorrectInvoiceDate
-		FROM ticketToInvoice tt
+		FROM tmp.ticketToInvoice tt
 			JOIN ticket t ON t.id = tt.id;

-	IF(vMaxShipped > vInvoiceDate) THEN 
+	IF(vMaxShipped > vInvoiceDate) THEN
 		CALL util.throw("Invoice date can't be less than max date");
 	END IF;
-		
+
 	IF NOT vIsCorrectInvoiceDate THEN
 		CALL util.throw('Exists an invoice with a previous date');
 	END IF;
-		
-	-- Eliminem de ticketToInvoice els tickets que no han de ser facturats
+
+	-- Eliminem de tmp.ticketToInvoice els tickets que no han de ser facturats
 	DELETE ti.*
-		FROM ticketToInvoice ti
+		FROM tmp.ticketToInvoice ti
 			JOIN ticket t ON t.id = ti.id
 			JOIN sale s ON s.ticketFk = t.id
 			JOIN item i ON i.id = s.itemFk
@ -77,11 +77,11 @@ BEGIN

 	SELECT SUM(s.quantity * s.price * (100 - s.discount)/100) <> 0
 		INTO vIsAnySaleToInvoice
-		FROM ticketToInvoice t
+		FROM tmp.ticketToInvoice t
 			JOIN sale s ON s.ticketFk = t.id;

 	SELECT COUNT(*) > 0 INTO vIsAnyServiceToInvoice
-		FROM ticketToInvoice t
+		FROM tmp.ticketToInvoice t
 			JOIN ticketService ts ON ts.ticketFk = t.id;

 	IF (vIsAnySaleToInvoice OR vIsAnyServiceToInvoice)
@ -121,13 +121,13 @@ BEGIN
 			WHERE id = vNewInvoiceId;

 		UPDATE ticket t
-				JOIN ticketToInvoice ti ON ti.id = t.id
+				JOIN tmp.ticketToInvoice ti ON ti.id = t.id
 			SET t.refFk = vNewRef;

 		DROP TEMPORARY TABLE IF EXISTS tmp.updateInter;
 		CREATE TEMPORARY TABLE tmp.updateInter ENGINE = MEMORY
 			SELECT s.id,ti.id ticket_id,vWorker Id_Trabajador
-				FROM ticketToInvoice ti
+				FROM tmp.ticketToInvoice ti
 					LEFT JOIN ticketState ts ON ti.id = ts.ticket
 					JOIN state s
 				WHERE IFNULL(ts.alertLevel,0) < 3 and s.`code` = getAlert3State(ti.id);
@ -137,7 +137,7 @@ BEGIN

 		INSERT INTO ticketLog (action, userFk, originFk, description)
 			SELECT 'UPDATE', account.myUser_getId(), ti.id, CONCAT('Crea factura ', vNewRef)
-				FROM ticketToInvoice ti;
+				FROM tmp.ticketToInvoice ti;

 		CALL invoiceExpenceMake(vNewInvoiceId);
 		CALL invoiceTaxMake(vNewInvoiceId,vTaxArea);
@ -157,12 +157,12 @@ BEGIN
 			WHERE io.id = vNewInvoiceId;

 		DROP TEMPORARY TABLE tmp.updateInter;
-	
-		SELECT COUNT(*), id 
+
+		SELECT COUNT(*), id
 				INTO vIsInterCompany, vInterCompanyFk
-			FROM company 
+			FROM company
 			WHERE clientFk = vClientFk;
-		
+
 		IF (vIsInterCompany) THEN

 			INSERT INTO invoiceIn(supplierFk, supplierRef, issued, companyFk)
@ -175,7 +175,7 @@ BEGIN
 				(KEY (ticketFk))
 				ENGINE = MEMORY
 				SELECT id ticketFk
-					FROM ticketToInvoice;
+					FROM tmp.ticketToInvoice;

 			CALL `ticket_getTax`('NATIONAL');

@ -201,7 +201,7 @@ BEGIN
 						) sub;

 			INSERT INTO invoiceInTax(invoiceInFk, taxableBase, expenceFk, taxTypeSageFk, transactionTypeSageFk)
-				SELECT vNewInvoiceInFk, 
+				SELECT vNewInvoiceInFk,
 						SUM(tt.taxableBase) - IF(tt.code = @vTaxCodeGeneral,
 						@vTaxableBaseServices, 0) taxableBase,
 						i.expenceFk,
@ -215,13 +215,13 @@ BEGIN
 					ORDER BY tt.priority;

 			CALL invoiceInDueDay_calculate(vNewInvoiceInFk);
-			
-			SELECT COUNT(*) INTO vIsCEESerial 
+
+			SELECT COUNT(*) INTO vIsCEESerial
 				FROM invoiceOutSerial
 				WHERE code = vSerial;

 			IF vIsCEESerial THEN
-			
+
 				INSERT INTO invoiceInIntrastat (
 						invoiceInFk,
 						intrastatFk,
@ -253,6 +253,6 @@ BEGIN
 			DROP TEMPORARY TABLE tmp.ticketServiceTax;
 		END IF;
 	END IF;
-	DROP TEMPORARY TABLE `ticketToInvoice`;
+	DROP TEMPORARY TABLE tmp.`ticketToInvoice`;
 END$$
-DELIMITER ;
+DELIMITER ;
--- a/db/changes/231601/00-saleTracking.sql
+++ b/db/changes/231601/00-saleTracking.sql
@ -0,0 +1,5 @@
+DROP PROCEDURE IF EXISTS `vn`.`sale_setQuantity`;
+DROP PROCEDURE IF EXISTS `vn`.`collection_updateSale`;
+DROP PROCEDURE IF EXISTS `vn`.`replaceMovimientosMark`;
+DROP PROCEDURE IF EXISTS `vn`.`saleTracking_Replace`;
+DROP PROCEDURE IF EXISTS `vn`.`sale_updateOriginalQuantity`;
--- a/db/dump/structure.sql
+++ b/db/dump/structure.sql
@ -42776,7 +42776,7 @@ CREATE DEFINER=`root`@`localhost` FUNCTION `hasAnyNegativeBase`() RETURNS tinyin
 BEGIN

 /*	Calcula si existe alguna base imponible negativa
-*	Requiere la tabla temporal vn.ticketToInvoice(id)
+*	Requiere la tabla temporal tmp.ticketToInvoice(id)
 *
 *	returns BOOLEAN
 */
@ -42787,7 +42787,7 @@ BEGIN
 		(KEY (ticketFk))
 		ENGINE = MEMORY
 		SELECT id ticketFk
-			FROM ticketToInvoice;
+			FROM tmp.ticketToInvoice;

 	CALL ticket_getTax(NULL);

@ -55223,7 +55223,7 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceExpenceMake`(IN vInvoice INT)
 BEGIN
 /* Inserta las partidas de gasto correspondientes a la factura
- * REQUIERE tabla ticketToInvoice
+ * REQUIERE tabla tmp.ticketToInvoice
 * @param vInvoice Numero de factura
 */
 	DELETE FROM invoiceOutExpence
@ -55233,7 +55233,7 @@ BEGIN
 		SELECT vInvoice,
 			   expenceFk,
 			   SUM(ROUND(quantity * price * (100 - discount)/100,2)) amount
-			FROM ticketToInvoice t
+			FROM tmp.ticketToInvoice t
 				JOIN sale s ON s.ticketFk = t.id
 				JOIN item i ON i.id = s.itemFk
 			GROUP BY i.expenceFk
@ -55243,7 +55243,7 @@ BEGIN
 		SELECT vInvoice,
 			   tst.expenceFk,
 			   SUM(ROUND(ts.quantity * ts.price ,2)) amount
-			FROM ticketToInvoice t
+			FROM tmp.ticketToInvoice t
 				JOIN ticketService ts ON ts.ticketFk = t.id
                JOIN ticketServiceType tst ON tst.id = ts.ticketServiceTypeFk
            HAVING amount != 0;
@ -55270,9 +55270,9 @@ BEGIN

 	SET vMaxTicketDate = vn2008.DAYEND(vMaxTicketDate);

-	DROP TEMPORARY TABLE IF EXISTS `ticketToInvoice`;
+	DROP TEMPORARY TABLE IF EXISTS `tmp`.`ticketToInvoice`;

-	CREATE TEMPORARY TABLE `ticketToInvoice`
+	CREATE TEMPORARY TABLE `tmp`.`ticketToInvoice`
 		(PRIMARY KEY  (`id`))
        ENGINE = MEMORY
 		SELECT Id_Ticket id FROM vn2008.Tickets WHERE (Fecha BETWEEN vMinDateTicket
@ -55305,8 +55305,8 @@ BEGIN
 	SET vMinTicketDate = util.firstDayOfYear(vMaxTicketDate - INTERVAL 1 YEAR);
 	SET vMaxTicketDate = util.dayend(vMaxTicketDate);

-	DROP TEMPORARY TABLE IF EXISTS `ticketToInvoice`;
-	CREATE TEMPORARY TABLE `ticketToInvoice`
+	DROP TEMPORARY TABLE IF EXISTS `tmp`.`ticketToInvoice`;
+	CREATE TEMPORARY TABLE `tmp`.`ticketToInvoice`
 		(PRIMARY KEY  (`id`))
 		ENGINE = MEMORY
 		SELECT id FROM ticket t
@ -55333,9 +55333,9 @@ DELIMITER ;;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceFromTicket`(IN vTicket INT)
 BEGIN

-	DROP TEMPORARY TABLE IF EXISTS `ticketToInvoice`;
+	DROP TEMPORARY TABLE IF EXISTS `tmp`.`ticketToInvoice`;

-	CREATE TEMPORARY TABLE `ticketToInvoice`
+	CREATE TEMPORARY TABLE `tmp`.`ticketToInvoice`
 	(PRIMARY KEY  (`id`))
        ENGINE = MEMORY
        SELECT id FROM vn.ticket
@ -55931,9 +55931,9 @@ BEGIN
 			JOIN invoiceOut io ON io.companyFk = s.id
 		WHERE io.id = vInvoiceFk;

-	DROP TEMPORARY TABLE IF EXISTS ticketToInvoice;
+	DROP TEMPORARY TABLE IF EXISTS tmp.ticketToInvoice;

-	CREATE TEMPORARY TABLE ticketToInvoice
+	CREATE TEMPORARY TABLE tmp.ticketToInvoice
        SELECT id
            FROM ticket
            WHERE refFk = vInvoiceRef;
@ -56408,9 +56408,9 @@ BEGIN
 				JOIN client c ON c.id = io.clientFk
 			WHERE io.id = vInvoice;

-		DROP TEMPORARY TABLE IF EXISTS ticketToInvoice;
+		DROP TEMPORARY TABLE IF EXISTS tmp.ticketToInvoice;

-		CREATE TEMPORARY TABLE ticketToInvoice
+		CREATE TEMPORARY TABLE tmp.ticketToInvoice
 			SELECT id
 				FROM ticket
 				WHERE refFk = vInvoiceRef;
@ -56456,7 +56456,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceOut_exportationFromClient`(
 	vCompanyFk INT)
 BEGIN
 /**
- * Genera tabla temporal ticketToInvoice necesaría para el proceso de facturación
+ * Genera tabla temporal tmp.ticketToInvoice necesaría para el proceso de facturación
 * Los abonos quedan excluidos en las exportaciones
 *
 * @param vMaxTicketDate Fecha hasta la cual cogerá tickets para facturar
@ -56467,8 +56467,8 @@ BEGIN
 	SET vMinTicketDate = util.firstDayOfYear(vMaxTicketDate - INTERVAL 1 YEAR);
 	SET vMaxTicketDate = util.dayend(vMaxTicketDate);

-	DROP TEMPORARY TABLE IF EXISTS `ticketToInvoice`;
-	CREATE TEMPORARY TABLE `ticketToInvoice`
+	DROP TEMPORARY TABLE IF EXISTS `tmp`.`ticketToInvoice`;
+	CREATE TEMPORARY TABLE `tmp`.`ticketToInvoice`
 		(PRIMARY KEY  (`id`))
 		ENGINE = MEMORY
 		SELECT t.id
@ -56503,7 +56503,7 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `invoiceOut_new`(
 BEGIN
 /**
 * Creación de facturas emitidas.
- * requiere previamente tabla ticketToInvoice(id).
+ * requiere previamente tabla tmp.ticketToInvoice(id).
 *
 * @param vSerial serie a la cual se hace la factura
 * @param vInvoiceDate fecha de la factura
@ -56531,13 +56531,13 @@ BEGIN

 	SELECT t.clientFk, t.companyFk
 			INTO vClientFk, vCompanyFk
-		FROM ticketToInvoice tt
+		FROM tmp.ticketToInvoice tt
 			JOIN ticket t ON t.id = tt.id
 		LIMIT 1;

-	-- Eliminem de ticketToInvoice els tickets que no han de ser facturats
+	-- Eliminem de tmp.ticketToInvoice els tickets que no han de ser facturats
 	DELETE ti.*
-		FROM ticketToInvoice ti
+		FROM tmp.ticketToInvoice ti
 			JOIN ticket t ON t.id = ti.id
 			JOIN sale s ON s.ticketFk = t.id
 			JOIN item i ON i.id = s.itemFk
@ -56552,7 +56552,7 @@ BEGIN

 	SELECT SUM(s.quantity * s.price * (100 - s.discount)/100), ts.id
 			INTO vIsAnySaleToInvoice, vIsAnyServiceToInvoice
-		FROM ticketToInvoice t
+		FROM tmp.ticketToInvoice t
 			LEFT JOIN sale s ON s.ticketFk = t.id
 			LEFT JOIN ticketService ts ON ts.ticketFk = t.id;

@ -56593,13 +56593,13 @@ BEGIN
 			WHERE id = vNewInvoiceId;

 		UPDATE ticket t
-				JOIN ticketToInvoice ti ON ti.id = t.id
+				JOIN tmp.ticketToInvoice ti ON ti.id = t.id
 			SET t.refFk = vNewRef;

 		DROP TEMPORARY TABLE IF EXISTS tmp.updateInter;
 		CREATE TEMPORARY TABLE tmp.updateInter ENGINE = MEMORY
 			SELECT s.id,ti.id ticket_id,vWorker Id_Trabajador
-				FROM ticketToInvoice ti
+				FROM tmp.ticketToInvoice ti
 					LEFT JOIN ticketState ts ON ti.id = ts.ticket
 					JOIN state s
 				WHERE IFNULL(ts.alertLevel,0) < 3 and s.`code` = getAlert3State(ti.id);
@ -56609,7 +56609,7 @@ BEGIN

 		INSERT INTO ticketLog (action, userFk, originFk, description)
 			SELECT 'UPDATE', account.myUser_getId(), ti.id, CONCAT('Crea factura ', vNewRef)
-				FROM ticketToInvoice ti;
+				FROM tmp.ticketToInvoice ti;

 		CALL invoiceExpenceMake(vNewInvoiceId);
 		CALL invoiceTaxMake(vNewInvoiceId,vTaxArea);
@ -56647,7 +56647,7 @@ BEGIN
 				(KEY (ticketFk))
 				ENGINE = MEMORY
 				SELECT id ticketFk
-					FROM ticketToInvoice;
+					FROM tmp.ticketToInvoice;

 			CALL `ticket_getTax`('NATIONAL');

@ -56725,7 +56725,7 @@ BEGIN
 			DROP TEMPORARY TABLE tmp.ticketServiceTax;
 		END IF;
 	END IF;
-	DROP TEMPORARY TABLE `ticketToInvoice`;
+	DROP TEMPORARY TABLE `tmp`.`ticketToInvoice`;
 END ;;
 DELIMITER ;
 /*!50003 SET sql_mode              = @saved_sql_mode */ ;
@ -56876,7 +56876,7 @@ BEGIN
 		(KEY (ticketFk))
 		ENGINE = MEMORY
 		SELECT id ticketFk
-			FROM ticketToInvoice;
+			FROM tmp.ticketToInvoice;

 	CALL ticket_getTax(vTaxArea);

@ -68689,7 +68689,7 @@ DELIMITER ;
 /*!50003 SET character_set_client  = @saved_cs_client */ ;
 /*!50003 SET character_set_results = @saved_cs_results */ ;
 /*!50003 SET collation_connection  = @saved_col_connection */ ;
-/*!50003 DROP PROCEDURE IF EXISTS `ticketToInvoiceByAddress` */;
+/*!50003 DROP PROCEDURE IF EXISTS `tmp`.`ticketToInvoiceByAddress` */;
 /*!50003 SET @saved_cs_client      = @@character_set_client */ ;
 /*!50003 SET @saved_cs_results     = @@character_set_results */ ;
 /*!50003 SET @saved_col_connection = @@collation_connection */ ;
@ -68709,9 +68709,9 @@ BEGIN

 	SET vEnded = util.dayEnd(vEnded);

-    DROP TEMPORARY TABLE IF EXISTS vn.ticketToInvoice;
+    DROP TEMPORARY TABLE IF EXISTS tmp.ticketToInvoice;

-    CREATE TEMPORARY TABLE vn.ticketToInvoice
+    CREATE TEMPORARY TABLE tmp.ticketToInvoice
        SELECT id
            FROM vn.ticket
            WHERE addressFk = vAddress
@ -68745,9 +68745,9 @@ BEGIN

 	SET vEnded = util.dayEnd(vEnded);

-    DROP TEMPORARY TABLE IF EXISTS vn.ticketToInvoice;
+    DROP TEMPORARY TABLE IF EXISTS tmp.ticketToInvoice;

-    CREATE TEMPORARY TABLE vn.ticketToInvoice
+    CREATE TEMPORARY TABLE tmp.ticketToInvoice
        SELECT id
            FROM vn.ticket
            WHERE clientFk = vClient
@ -68808,9 +68808,9 @@ BEGIN
 			JOIN vn.client c ON c.id = io.clientFk
        WHERE io.id = vInvoice;

-	DROP TEMPORARY TABLE IF EXISTS vn.ticketToInvoice;
+	DROP TEMPORARY TABLE IF EXISTS tmp.ticketToInvoice;

-	CREATE TEMPORARY TABLE vn.ticketToInvoice
+	CREATE TEMPORARY TABLE tmp.ticketToInvoice
        SELECT id
            FROM vn.ticket
            WHERE refFk = vInvoiceRef;
--- a/modules/client/back/methods/client/setPassword.js
+++ b/modules/client/back/methods/client/setPassword.js
@ -28,7 +28,7 @@ module.exports = Self => {
        const isAccount = await models.Account.findById(id);

        if (isClient && !isAccount)
-            await models.VnUser.setPassword(id, newPassword);
+            await models.Account.setPassword(id, newPassword);
        else
            throw new UserError(`Modifiable password only via recovery or by an administrator`);
    };
--- a/modules/ticket/back/methods/ticket/makeInvoice.js
+++ b/modules/ticket/back/methods/ticket/makeInvoice.js
@ -75,8 +75,8 @@ module.exports = function(Self) {
            serial = result.serial;

            await Self.rawSql(`
-                DROP TEMPORARY TABLE IF EXISTS ticketToInvoice;
-                CREATE TEMPORARY TABLE ticketToInvoice
+                DROP TEMPORARY TABLE IF EXISTS tmp.ticketToInvoice;
+                CREATE TEMPORARY TABLE tmp.ticketToInvoice
                (PRIMARY KEY  (id))
                    ENGINE = MEMORY
                    SELECT id FROM vn.ticket