From e4969f70616391f261cfced2107e05f78c530977 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= <carlosap@verdnatura.es>
Date: Tue, 4 Jun 2024 16:43:09 +0200
Subject: [PATCH] Hotfix: ledger_next transacciones refs #7523

---
 db/routines/util/procedures/tx_commit.sql             |  6 +++---
 db/routines/util/procedures/tx_rollback.sql           |  4 ++--
 db/routines/util/procedures/tx_start.sql              |  6 +++---
 db/routines/vn/procedures/ledger_nextTx.sql           |  8 ++++----
 db/routines/vn/procedures/travel_cloneWithEntries.sql | 10 +++++-----
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/db/routines/util/procedures/tx_commit.sql b/db/routines/util/procedures/tx_commit.sql
index 8eb0c7426..35f96df8d 100644
--- a/db/routines/util/procedures/tx_commit.sql
+++ b/db/routines/util/procedures/tx_commit.sql
@@ -1,12 +1,12 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`tx_commit`(isTx BOOL)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`tx_commit`(vIsTx BOOL)
 BEGIN
 /**
  * Confirma los cambios asociados a una transacción.
  *
- * @param isTx es true si existe transacción asociada
+ * @param vIsTx es true si existe transacción asociada
 */
-    IF NOT isTx THEN
+    IF vIsTx THEN
         COMMIT;
     END IF;
 END$$
diff --git a/db/routines/util/procedures/tx_rollback.sql b/db/routines/util/procedures/tx_rollback.sql
index 8909a96bb..82f771024 100644
--- a/db/routines/util/procedures/tx_rollback.sql
+++ b/db/routines/util/procedures/tx_rollback.sql
@@ -1,12 +1,12 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`tx_rollback`(isTx BOOL)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`tx_rollback`(vIsTx BOOL)
 BEGIN
 /**
  * Deshace los cambios asociados a una transacción.
  *
  * @param isTx es true si existe transacción asociada
 */
-    IF NOT isTx THEN
+    IF vIsTx THEN
         ROLLBACK;
     END IF;
 END$$
diff --git a/db/routines/util/procedures/tx_start.sql b/db/routines/util/procedures/tx_start.sql
index aa410ff72..41f8c94ee 100644
--- a/db/routines/util/procedures/tx_start.sql
+++ b/db/routines/util/procedures/tx_start.sql
@@ -1,12 +1,12 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`tx_start`(isTx BOOL)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `util`.`tx_start`(vIsTx BOOL)
 BEGIN
 /**
  * Inicia una transacción.
  *
- * @param isTx es true si existe transacción asociada
+ * @param vIsTx es true si existe transacción asociada
 */
-    IF NOT isTx THEN
+    IF vIsTx THEN
         START TRANSACTION;
     END IF;
 END$$
diff --git a/db/routines/vn/procedures/ledger_nextTx.sql b/db/routines/vn/procedures/ledger_nextTx.sql
index abe96a21e..98c157676 100644
--- a/db/routines/vn/procedures/ledger_nextTx.sql
+++ b/db/routines/vn/procedures/ledger_nextTx.sql
@@ -12,10 +12,10 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`ledger_nextTx`(
  * @return vLastBookEntry Id del asiento
  */
 BEGIN
-	DECLARE vhasTx BOOL DEFAULT @@in_transaction;
+	DECLARE vIsRequiredTx BOOL DEFAULT NOT @@in_transaction;
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 	BEGIN
-		CALL util.tx_rollback(vhasTx);
+		CALL util.tx_rollback(vIsRequiredTx);
 		RESIGNAL;
 	END;
 
@@ -23,8 +23,8 @@ BEGIN
 		CALL util.throw('Fiscal year is required');
 	END IF;
 		
-	CALL util.tx_start(vhasTx);
+	CALL util.tx_start(vIsRequiredTx);
 	CALL ledger_next(vFiscalYear, vLastBookEntry);
-	CALL util.tx_commit(vhasTx);
+	CALL util.tx_commit(vIsRequiredTx);
 END$$
 DELIMITER ;
\ No newline at end of file
diff --git a/db/routines/vn/procedures/travel_cloneWithEntries.sql b/db/routines/vn/procedures/travel_cloneWithEntries.sql
index 7cf9ee5ef..c51a68ecd 100644
--- a/db/routines/vn/procedures/travel_cloneWithEntries.sql
+++ b/db/routines/vn/procedures/travel_cloneWithEntries.sql
@@ -24,8 +24,8 @@ BEGIN
 	DECLARE vEvaNotes VARCHAR(255);
 	DECLARE vDone BOOL;
 	DECLARE vAuxEntryFk INT;
-    DECLARE vTx BOOLEAN DEFAULT @@in_transaction;
-	DECLARE vRsEntry CURSOR FOR
+    DECLARE vDoTx BOOLEAN DEFAULT NOT @@in_transaction;
+	DECLARE vIsRequiredTx CURSOR FOR
 		SELECT e.id
 			FROM entry e
 				JOIN travel t ON t.id = e.travelFk
@@ -35,11 +35,11 @@ BEGIN
 
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 	BEGIN
-		CALL util.tx_rollback(vTx);
+		CALL util.tx_rollback(vIsRequiredTx);
 		RESIGNAL;
 	END;
 
-    CALL util.tx_start(vTx);
+    CALL util.tx_start(vIsRequiredTx);
 
 	INSERT INTO travel (shipped, landed, warehouseInFk, warehouseOutFk, agencyModeFk, `ref`, isDelivered, isReceived, m3, cargoSupplierFk, kg,clonedFrom)
 		SELECT vDateStart, vDateEnd, vWarehouseInFk, vWarehouseOutFk, vAgencyModeFk, vRef, isDelivered, isReceived, m3,cargoSupplierFk, kg,vTravelFk
@@ -76,6 +76,6 @@ BEGIN
 	SET @isModeInventory = FALSE;
 	CLOSE vRsEntry;
 
-    CALL util.tx_commit(vTx);
+    CALL util.tx_commit(vIsRequiredTx);
 END$$
 DELIMITER ;