From 9585af8e77a2d8566078fb171276be1f047ddd9a Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Thu, 23 May 2024 12:39:30 +0200
Subject: [PATCH 01/31] feat: refs #6822 create entryTransfer

---
 db/routines/vn/procedures/entryTransfer.sql | 113 ++++++++++++++++++++
 db/routines/vn/procedures/entry_clone.sql   |   9 +-
 2 files changed, 120 insertions(+), 2 deletions(-)
 create mode 100644 db/routines/vn/procedures/entryTransfer.sql

diff --git a/db/routines/vn/procedures/entryTransfer.sql b/db/routines/vn/procedures/entryTransfer.sql
new file mode 100644
index 0000000000..b0d3c98e3d
--- /dev/null
+++ b/db/routines/vn/procedures/entryTransfer.sql
@@ -0,0 +1,113 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`entryTransfer`(vOriginalEntry INT)
+BEGIN
+/**
+* If the bic length is Incorrect throw exception
+* 
+* @param vBic bic code
+*/
+
+	DECLARE vNewEntryFk INT;
+	DECLARE vTravelFk INT;
+	DECLARE vWarehouseFk INT;
+
+	-- Clonar la entrada
+	CALL entry_clone(vOriginalEntry);
+
+	SELECT id INTO vNewEntryFk
+		FROM entry 
+		WHERE clonedFrom = vOriginalEntry
+		ORDER BY dated DESC 
+		LIMIT 1;
+
+	-- Hay que crear un nuevo travel,  con salida hoy y llegada mañana y asignar la entrada nueva al nuevo travel.
+	INSERT INTO travel(
+				shipped,
+				landed,
+				warehouseInFk,
+				warehouseOutFk,
+				`ref`,
+				isReceived,
+				agencyModeFk)
+			SELECT util.VN_CURDATE(),
+					util.VN_CURDATE() + INTERVAL 1 DAY,
+					t.warehouseInFk,
+					t.warehouseOutFk,
+					t.`ref`,
+					t.isReceived,
+					t.agencyModeFk
+				FROM travel t
+					JOIN entry e ON e.travelFk = t.id
+				WHERE e.id  = vOriginalEntry;
+
+	SET vTravelFk = LAST_INSERT_ID();
+
+	UPDATE entry
+		SET travelFk = vTravelFk
+		WHERE id = vNewEntryFk;
+
+	-- Poner a 0 las cantidades
+	UPDATE buy b
+		SET b.quantity = 0, b.stickers = 0
+		WHERE b.entryFk = vNewEntryFk;
+
+	-- Eliminar duplicados
+	DELETE b.*
+		FROM buy b
+			LEFT JOIN (SELECT b.id, b.itemFk 
+							FROM buy b 
+							WHERE b.entryFk = vNewEntryFk
+							GROUP BY b.itemFk) tBuy ON tBuy.id = b.id
+		WHERE b.entryFk = vNewEntryFk
+			AND tBuy.id IS NULL;
+	
+	SELECT t.warehouseInFk INTO vWarehouseFk
+		FROM travel t
+			JOIN entry e ON e.travelFk = t.id
+		WHERE e.id = vOriginalEntry;
+
+	-- Actualizar la nueva entrada con lo que no está ubicado HOY, descontando lo vendido HOY de esas ubicaciones
+	UPDATE buy b
+		JOIN (
+			SELECT tBuy.itemFk, IFNULL(iss.visible,0) visible, tBuy.totalQuantity, IFNULL(sales.sold,0) sold
+				FROM (SELECT b.itemFk, SUM(b.quantity) totalQuantity
+							FROM buy b
+							WHERE b.entryFk = vOriginalEntry
+							GROUP BY b.itemFk
+						) tBuy 
+					LEFT JOIN (
+						SELECT ish.itemFk, SUM(visible) visible
+							FROM itemShelving ish
+								JOIN shelving sh ON sh.code = ish.shelvingFk
+								JOIN parking p ON p.id = sh.parkingFk
+								JOIN sector s ON s.id = p.sectorFk
+							WHERE s.warehouseFk = vWarehouseFk
+								AND sh.parked = util.VN_CURDATE()
+							GROUP BY ish.itemFk) iss ON tBuy.itemFk = iss.itemFk
+					LEFT JOIN (
+						SELECT s.itemFk, SUM(s.quantity) sold
+							FROM ticket t
+								JOIN sale s ON s.ticketFk = t.id
+								JOIN itemShelvingSale iss ON iss.saleFk = s.id
+								JOIN itemShelving is2 ON is2.id = iss.itemShelvingFk
+								JOIN shelving s2 ON s2.code = is2.shelvingFk
+							WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
+								AND s2.parked = util.VN_CURDATE()
+							GROUP BY s.itemFk) sales ON sales.itemFk = tBuy.itemFk
+				WHERE visible = tBuy.totalQuantity 
+					OR iss.itemFk IS NULL
+			) sub ON sub.itemFk = b.itemFk
+		SET b.quantity = sub.totalQuantity - sub.visible - sub.sold
+		WHERE b.entryFk = vNewEntryFk;
+	
+	-- Limpia la nueva entrada
+	DELETE b.*
+		FROM buy b
+		WHERE b.entryFk = vNewEntryFk
+			AND b.quantity = 0;
+
+	CALL cache.visible_refresh(@c,TRUE,7);
+	CALL cache.available_refresh(@c, TRUE, 7, util.VN_CURDATE());
+
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/entry_clone.sql b/db/routines/vn/procedures/entry_clone.sql
index 4f38447c89..b970ac0fff 100644
--- a/db/routines/vn/procedures/entry_clone.sql
+++ b/db/routines/vn/procedures/entry_clone.sql
@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`entry_clone`(vSelf INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`entry_clone`(IN vSelf INT, OUT vNewEntryFk INT)
 BEGIN
 /**
  * clones an entry.
@@ -8,6 +8,12 @@ BEGIN
  */
 	DECLARE vNewEntryFk INT;
 
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		ROLLBACK;
+		RESIGNAL;
+	END;
+
 	START TRANSACTION;
 
 	CALL entry_cloneHeader(vSelf, vNewEntryFk, NULL);
@@ -15,6 +21,5 @@ BEGIN
 
 	COMMIT;
 
-	SELECT vNewEntryFk;
 END$$
 DELIMITER ;

From bac07fe265c0393bbbe329bea42e63b6ae5d270f Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Thu, 23 May 2024 12:41:59 +0200
Subject: [PATCH 02/31] feat: refs #6822

---
 db/routines/vn/procedures/entryTransfer.sql | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/db/routines/vn/procedures/entryTransfer.sql b/db/routines/vn/procedures/entryTransfer.sql
index b0d3c98e3d..64c9b76804 100644
--- a/db/routines/vn/procedures/entryTransfer.sql
+++ b/db/routines/vn/procedures/entryTransfer.sql
@@ -12,13 +12,7 @@ BEGIN
 	DECLARE vWarehouseFk INT;
 
 	-- Clonar la entrada
-	CALL entry_clone(vOriginalEntry);
-
-	SELECT id INTO vNewEntryFk
-		FROM entry 
-		WHERE clonedFrom = vOriginalEntry
-		ORDER BY dated DESC 
-		LIMIT 1;
+	CALL entry_clone(vOriginalEntry,vNewEntryFk);
 
 	-- Hay que crear un nuevo travel,  con salida hoy y llegada mañana y asignar la entrada nueva al nuevo travel.
 	INSERT INTO travel(

From 04f6059d6f67978947f7f385bded3c2c90640839 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Wed, 3 Jul 2024 12:03:28 +0200
Subject: [PATCH 03/31] feat: refs #6822

---
 modules/entry/back/methods/entry/transfer.js | 38 ++++++++++++++++++++
 modules/entry/back/models/entry.js           |  1 +
 2 files changed, 39 insertions(+)
 create mode 100644 modules/entry/back/methods/entry/transfer.js

diff --git a/modules/entry/back/methods/entry/transfer.js b/modules/entry/back/methods/entry/transfer.js
new file mode 100644
index 0000000000..9778326943
--- /dev/null
+++ b/modules/entry/back/methods/entry/transfer.js
@@ -0,0 +1,38 @@
+module.exports = Self => {
+    Self.remoteMethodCtx('transfer', {
+        description: 'Trasladar la mercancia de una entrada al dia siguiente',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'number',
+                required: true,
+                http: {source: 'path'}
+            }
+        ],
+        http: {
+            path: '/:id/transfer',
+            verb: 'POST'
+        }
+    });
+
+    Self.transfer = async(ctx, id, options) => {
+        const myOptions = {userId: ctx.req.accessToken.userId};
+        let tx;
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        if (!myOptions.transaction) {
+            tx = await Self.beginTransaction({});
+            myOptions.transaction = tx;
+        }
+
+        try {
+            await Self.rawSql('CALL vn.entryTransfer(?)', [id], myOptions);
+            if (tx) await tx.commit();
+        } catch (e) {
+            if (tx) await tx.rollback();
+            throw e;
+        }
+    };
+};
diff --git a/modules/entry/back/models/entry.js b/modules/entry/back/models/entry.js
index 6e27e1ece5..5f47d718e2 100644
--- a/modules/entry/back/models/entry.js
+++ b/modules/entry/back/models/entry.js
@@ -10,6 +10,7 @@ module.exports = Self => {
     require('../methods/entry/addFromPackaging')(Self);
     require('../methods/entry/addFromBuy')(Self);
     require('../methods/entry/buyLabel')(Self);
+    require('../methods/entry/transfer')(Self);
 
     Self.observe('before save', async function(ctx, options) {
         if (ctx.isNewInstance) return;

From a34376f4d2bf998042920dadc33d3d09711d1452 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Wed, 10 Jul 2024 07:31:49 +0200
Subject: [PATCH 04/31] feat: refs #6822

---
 .../vn/procedures/{entryTransfer.sql => entry_transfer.sql}     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename db/routines/vn/procedures/{entryTransfer.sql => entry_transfer.sql} (98%)

diff --git a/db/routines/vn/procedures/entryTransfer.sql b/db/routines/vn/procedures/entry_transfer.sql
similarity index 98%
rename from db/routines/vn/procedures/entryTransfer.sql
rename to db/routines/vn/procedures/entry_transfer.sql
index 64c9b76804..c0f111c343 100644
--- a/db/routines/vn/procedures/entryTransfer.sql
+++ b/db/routines/vn/procedures/entry_transfer.sql
@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`entryTransfer`(vOriginalEntry INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`entry_transfer`(vOriginalEntry INT)
 BEGIN
 /**
 * If the bic length is Incorrect throw exception

From 5a7d5787f725e15fd86d0e737ab50aed37d1733d Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Thu, 11 Jul 2024 07:38:13 +0200
Subject: [PATCH 05/31] feat: refs #6822 clonar travel con warehouseInFk

---
 db/routines/vn/procedures/entry_transfer.sql | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/db/routines/vn/procedures/entry_transfer.sql b/db/routines/vn/procedures/entry_transfer.sql
index c0f111c343..aedfdb7d61 100644
--- a/db/routines/vn/procedures/entry_transfer.sql
+++ b/db/routines/vn/procedures/entry_transfer.sql
@@ -2,9 +2,9 @@ DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`entry_transfer`(vOriginalEntry INT)
 BEGIN
 /**
-* If the bic length is Incorrect throw exception
+* Adelanta a mañana la mercancia de una entrada a partir de lo que hay ubicado en el almacén
 * 
-* @param vBic bic code
+* @param vOriginalEntry entrada que se quiera adelantar
 */
 
 	DECLARE vNewEntryFk INT;
@@ -14,7 +14,7 @@ BEGIN
 	-- Clonar la entrada
 	CALL entry_clone(vOriginalEntry,vNewEntryFk);
 
-	-- Hay que crear un nuevo travel,  con salida hoy y llegada mañana y asignar la entrada nueva al nuevo travel.
+	-- Hay que crear un nuevo travel, con salida hoy y llegada mañana y asignar la entrada nueva al nuevo travel.
 	INSERT INTO travel(
 				shipped,
 				landed,
@@ -26,7 +26,7 @@ BEGIN
 			SELECT util.VN_CURDATE(),
 					util.VN_CURDATE() + INTERVAL 1 DAY,
 					t.warehouseInFk,
-					t.warehouseOutFk,
+					t.warehouseInFk,
 					t.`ref`,
 					t.isReceived,
 					t.agencyModeFk

From d60a1a3424a19c0ead18976bf53a74d24bb3109b Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Thu, 11 Jul 2024 09:39:06 +0200
Subject: [PATCH 06/31] feat: refs #6822 entry_clone

---
 db/routines/vn/procedures/entry_clone.sql | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/db/routines/vn/procedures/entry_clone.sql b/db/routines/vn/procedures/entry_clone.sql
index b970ac0fff..679af5f474 100644
--- a/db/routines/vn/procedures/entry_clone.sql
+++ b/db/routines/vn/procedures/entry_clone.sql
@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`entry_clone`(IN vSelf INT, OUT vNewEntryFk INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`entry_clone`(IN vSelf INT, OUT newEntryFk INT)
 BEGIN
 /**
  * clones an entry.
@@ -20,6 +20,7 @@ BEGIN
 	CALL entry_copyBuys(vSelf, vNewEntryFk);
 
 	COMMIT;
+	SET newEntryFk = vNewEntryFk;
 
 END$$
 DELIMITER ;

From 109770b0a37059b9a53bf626b5adf230ea29cf42 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Wed, 17 Jul 2024 10:28:22 +0200
Subject: [PATCH 07/31] feat: refs #6822 return newEntry

---
 db/routines/vn/procedures/entry_transfer.sql | 14 +++++++++++++-
 modules/entry/back/methods/entry/transfer.js |  9 ++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/db/routines/vn/procedures/entry_transfer.sql b/db/routines/vn/procedures/entry_transfer.sql
index aedfdb7d61..64cafe043b 100644
--- a/db/routines/vn/procedures/entry_transfer.sql
+++ b/db/routines/vn/procedures/entry_transfer.sql
@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`entry_transfer`(vOriginalEntry INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`entry_transfer`(vOriginalEntry INT, OUT vNewEntry INT)
 BEGIN
 /**
 * Adelanta a mañana la mercancia de una entrada a partir de lo que hay ubicado en el almacén
@@ -11,6 +11,16 @@ BEGIN
 	DECLARE vTravelFk INT;
 	DECLARE vWarehouseFk INT;
 
+	DECLARE CONTINUE HANDLER FOR NOT FOUND
+	SET vDone = TRUE; 
+
+	DECLARE EXIT HANDLER FOR SQLEXCEPTION
+	BEGIN
+		ROLLBACK;
+		RESIGNAL;
+	END;
+	
+	START TRANSACTION;
 	-- Clonar la entrada
 	CALL entry_clone(vOriginalEntry,vNewEntryFk);
 
@@ -100,6 +110,8 @@ BEGIN
 		WHERE b.entryFk = vNewEntryFk
 			AND b.quantity = 0;
 
+	SET vNewEntry = vNewEntryFk;
+	COMMIT;
 	CALL cache.visible_refresh(@c,TRUE,7);
 	CALL cache.available_refresh(@c, TRUE, 7, util.VN_CURDATE());
 
diff --git a/modules/entry/back/methods/entry/transfer.js b/modules/entry/back/methods/entry/transfer.js
index 9778326943..53ae4b48c6 100644
--- a/modules/entry/back/methods/entry/transfer.js
+++ b/modules/entry/back/methods/entry/transfer.js
@@ -12,6 +12,10 @@ module.exports = Self => {
         http: {
             path: '/:id/transfer',
             verb: 'POST'
+        },
+        returns: {
+            arg: 'newEntryFk',
+            type: 'number'
         }
     });
 
@@ -28,8 +32,11 @@ module.exports = Self => {
         }
 
         try {
-            await Self.rawSql('CALL vn.entryTransfer(?)', [id], myOptions);
+            await Self.rawSql('CALL vn.entry_transfer(?, @vNewEntry)', [id], myOptions);
+            const newEntryFk = await Self.rawSql('SELECT @vNewEntry AS newEntryFk', [], myOptions);
+
             if (tx) await tx.commit();
+            return newEntryFk;
         } catch (e) {
             if (tx) await tx.rollback();
             throw e;

From 2cb8d07aef43e1021a86e8ebdfbb316ec47116ab Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Wed, 17 Jul 2024 10:30:23 +0200
Subject: [PATCH 08/31] feat: refs #6822

---
 db/routines/vn/procedures/entry_transfer.sql | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/db/routines/vn/procedures/entry_transfer.sql b/db/routines/vn/procedures/entry_transfer.sql
index 64cafe043b..efe630e365 100644
--- a/db/routines/vn/procedures/entry_transfer.sql
+++ b/db/routines/vn/procedures/entry_transfer.sql
@@ -11,9 +11,6 @@ BEGIN
 	DECLARE vTravelFk INT;
 	DECLARE vWarehouseFk INT;
 
-	DECLARE CONTINUE HANDLER FOR NOT FOUND
-	SET vDone = TRUE; 
-
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 	BEGIN
 		ROLLBACK;
@@ -111,9 +108,9 @@ BEGIN
 			AND b.quantity = 0;
 
 	SET vNewEntry = vNewEntryFk;
-	COMMIT;
+
 	CALL cache.visible_refresh(@c,TRUE,7);
 	CALL cache.available_refresh(@c, TRUE, 7, util.VN_CURDATE());
-
+	COMMIT;
 END$$
 DELIMITER ;

From 5f63017853f5838ca570ac95dd9f9553d2533f26 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Tue, 6 Aug 2024 07:20:30 +0200
Subject: [PATCH 09/31] feat: refs #6822 changes transaction

---
 .../bs/procedures/ventas_contables_add.sql    |  2 +-
 .../vn/procedures/entry_splitByShelving.sql   |  4 +-
 db/routines/vn/procedures/entry_transfer.sql  | 67 ++++++++++---------
 3 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/db/routines/bs/procedures/ventas_contables_add.sql b/db/routines/bs/procedures/ventas_contables_add.sql
index 72b0c0feed..c82cb96d9c 100644
--- a/db/routines/bs/procedures/ventas_contables_add.sql
+++ b/db/routines/bs/procedures/ventas_contables_add.sql
@@ -15,7 +15,7 @@ BEGIN
 
 	DELETE FROM bs.ventas_contables
 		WHERE year = vYear
-	    	AND month = vMonth;
+			AND month = vMonth;
 
 	DROP TEMPORARY TABLE IF EXISTS tmp.ticket_list;
 	CREATE TEMPORARY TABLE tmp.ticket_list
diff --git a/db/routines/vn/procedures/entry_splitByShelving.sql b/db/routines/vn/procedures/entry_splitByShelving.sql
index f46278e5ab..a8df482fa0 100644
--- a/db/routines/vn/procedures/entry_splitByShelving.sql
+++ b/db/routines/vn/procedures/entry_splitByShelving.sql
@@ -34,14 +34,14 @@ BEGIN
 
 	read_loop: LOOP
 		SET vDone = FALSE;
-	
+
 		FETCH cur INTO vBuyFk, vIshStickers, vBuyStickers;
 
 		IF vDone THEN
 			LEAVE read_loop;
 		END IF;
 
-		IF vIshStickers =  vBuyStickers THEN
+		IF vIshStickers = vBuyStickers THEN
 			UPDATE buy
 				SET entryFk = vToEntryFk
 				WHERE id = vBuyFk;
diff --git a/db/routines/vn/procedures/entry_transfer.sql b/db/routines/vn/procedures/entry_transfer.sql
index efe630e365..6d7da2b378 100644
--- a/db/routines/vn/procedures/entry_transfer.sql
+++ b/db/routines/vn/procedures/entry_transfer.sql
@@ -17,10 +17,11 @@ BEGIN
 		RESIGNAL;
 	END;
 	
-	START TRANSACTION;
 	-- Clonar la entrada
 	CALL entry_clone(vOriginalEntry,vNewEntryFk);
 
+	START TRANSACTION;
+
 	-- Hay que crear un nuevo travel, con salida hoy y llegada mañana y asignar la entrada nueva al nuevo travel.
 	INSERT INTO travel(
 				shipped,
@@ -68,36 +69,38 @@ BEGIN
 		WHERE e.id = vOriginalEntry;
 
 	-- Actualizar la nueva entrada con lo que no está ubicado HOY, descontando lo vendido HOY de esas ubicaciones
+	CREATE OR REPLACE TEMPORARY TABLE tBuy
+		ENGINE = MEMORY
+		SELECT tBuy.itemFk, IFNULL(iss.visible,0) visible, tBuy.totalQuantity, IFNULL(sales.sold,0) sold
+			FROM (SELECT b.itemFk, SUM(b.quantity) totalQuantity
+						FROM buy b
+						WHERE b.entryFk = vOriginalEntry
+						GROUP BY b.itemFk
+					) tBuy 
+				LEFT JOIN (
+					SELECT ish.itemFk, SUM(visible) visible
+						FROM itemShelving ish
+							JOIN shelving sh ON sh.code = ish.shelvingFk
+							JOIN parking p ON p.id = sh.parkingFk
+							JOIN sector s ON s.id = p.sectorFk
+						WHERE s.warehouseFk = vWarehouseFk
+							AND sh.parked = util.VN_CURDATE()
+						GROUP BY ish.itemFk) iss ON tBuy.itemFk = iss.itemFk
+				LEFT JOIN (
+					SELECT s.itemFk, SUM(s.quantity) sold
+						FROM ticket t
+							JOIN sale s ON s.ticketFk = t.id
+							JOIN itemShelvingSale iss ON iss.saleFk = s.id
+							JOIN itemShelving is2 ON is2.id = iss.itemShelvingFk
+							JOIN shelving s2 ON s2.code = is2.shelvingFk
+						WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
+							AND s2.parked = util.VN_CURDATE()
+						GROUP BY s.itemFk) sales ON sales.itemFk = tBuy.itemFk
+			WHERE visible = tBuy.totalQuantity 
+				OR iss.itemFk IS NULL;
+
 	UPDATE buy b
-		JOIN (
-			SELECT tBuy.itemFk, IFNULL(iss.visible,0) visible, tBuy.totalQuantity, IFNULL(sales.sold,0) sold
-				FROM (SELECT b.itemFk, SUM(b.quantity) totalQuantity
-							FROM buy b
-							WHERE b.entryFk = vOriginalEntry
-							GROUP BY b.itemFk
-						) tBuy 
-					LEFT JOIN (
-						SELECT ish.itemFk, SUM(visible) visible
-							FROM itemShelving ish
-								JOIN shelving sh ON sh.code = ish.shelvingFk
-								JOIN parking p ON p.id = sh.parkingFk
-								JOIN sector s ON s.id = p.sectorFk
-							WHERE s.warehouseFk = vWarehouseFk
-								AND sh.parked = util.VN_CURDATE()
-							GROUP BY ish.itemFk) iss ON tBuy.itemFk = iss.itemFk
-					LEFT JOIN (
-						SELECT s.itemFk, SUM(s.quantity) sold
-							FROM ticket t
-								JOIN sale s ON s.ticketFk = t.id
-								JOIN itemShelvingSale iss ON iss.saleFk = s.id
-								JOIN itemShelving is2 ON is2.id = iss.itemShelvingFk
-								JOIN shelving s2 ON s2.code = is2.shelvingFk
-							WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
-								AND s2.parked = util.VN_CURDATE()
-							GROUP BY s.itemFk) sales ON sales.itemFk = tBuy.itemFk
-				WHERE visible = tBuy.totalQuantity 
-					OR iss.itemFk IS NULL
-			) sub ON sub.itemFk = b.itemFk
+			JOIN (SELECT * FROM tBuy) sub ON sub.itemFk = b.itemFk
 		SET b.quantity = sub.totalQuantity - sub.visible - sub.sold
 		WHERE b.entryFk = vNewEntryFk;
 	
@@ -107,10 +110,12 @@ BEGIN
 		WHERE b.entryFk = vNewEntryFk
 			AND b.quantity = 0;
 
+	COMMIT;
+
 	SET vNewEntry = vNewEntryFk;
 
 	CALL cache.visible_refresh(@c,TRUE,7);
 	CALL cache.available_refresh(@c, TRUE, 7, util.VN_CURDATE());
-	COMMIT;
+
 END$$
 DELIMITER ;

From e99920196918815c4b7c32da2a47dea48c5f764b Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Wed, 11 Sep 2024 09:59:01 +0200
Subject: [PATCH 10/31] feat: refs #6822 entry_clone

---
 db/routines/vn/procedures/entry_clone.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/routines/vn/procedures/entry_clone.sql b/db/routines/vn/procedures/entry_clone.sql
index 1f436e230f..122d521cb4 100644
--- a/db/routines/vn/procedures/entry_clone.sql
+++ b/db/routines/vn/procedures/entry_clone.sql
@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`entry_clone`(vSelf INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`entry_clone`(vSelf INT, OUT newEntryFk INT)
 BEGIN
 /**
  * clones an entry.

From 9a01ae5ccc5f1e07ab36a31dc2f3bf6377cf9d4a Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Wed, 23 Oct 2024 12:32:48 +0200
Subject: [PATCH 11/31] feat: refs #6822 tabulaciones

---
 db/routines/vn/procedures/entry_transfer.sql | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/db/routines/vn/procedures/entry_transfer.sql b/db/routines/vn/procedures/entry_transfer.sql
index 6d7da2b378..9fbf561b23 100644
--- a/db/routines/vn/procedures/entry_transfer.sql
+++ b/db/routines/vn/procedures/entry_transfer.sql
@@ -2,11 +2,10 @@ DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`entry_transfer`(vOriginalEntry INT, OUT vNewEntry INT)
 BEGIN
 /**
-* Adelanta a mañana la mercancia de una entrada a partir de lo que hay ubicado en el almacén
-* 
-* @param vOriginalEntry entrada que se quiera adelantar
-*/
-
+ * Adelanta a mañana la mercancia de una entrada a partir de lo que hay ubicado en el almacén
+ * 
+ * @param vOriginalEntry entrada que se quiera adelantar
+ */
 	DECLARE vNewEntryFk INT;
 	DECLARE vTravelFk INT;
 	DECLARE vWarehouseFk INT;
@@ -40,7 +39,7 @@ BEGIN
 					t.agencyModeFk
 				FROM travel t
 					JOIN entry e ON e.travelFk = t.id
-				WHERE e.id  = vOriginalEntry;
+				WHERE e.id = vOriginalEntry;
 
 	SET vTravelFk = LAST_INSERT_ID();
 
@@ -116,6 +115,5 @@ BEGIN
 
 	CALL cache.visible_refresh(@c,TRUE,7);
 	CALL cache.available_refresh(@c, TRUE, 7, util.VN_CURDATE());
-
 END$$
 DELIMITER ;

From 4b474834cfd5b15586dfb1e3159eafc8faa5aa05 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Thu, 28 Nov 2024 08:13:53 +0100
Subject: [PATCH 12/31] feat: refs #6822 change request

---
 db/routines/vn/procedures/entry_clone.sql    |  6 +-
 db/routines/vn/procedures/entry_transfer.sql | 96 +++++++++++---------
 2 files changed, 59 insertions(+), 43 deletions(-)

diff --git a/db/routines/vn/procedures/entry_clone.sql b/db/routines/vn/procedures/entry_clone.sql
index 122d521cb4..12738af545 100644
--- a/db/routines/vn/procedures/entry_clone.sql
+++ b/db/routines/vn/procedures/entry_clone.sql
@@ -1,10 +1,14 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`entry_clone`(vSelf INT, OUT newEntryFk INT)
+CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`entry_clone`(
+	vSelf INT,
+	OUT newEntryFk INT
+)
 BEGIN
 /**
  * clones an entry.
  *
  * @param vSelf The entry id
+ * @param newEntryFk Output parameter of the new created input
  */
 	DECLARE vNewEntryFk INT;
 
diff --git a/db/routines/vn/procedures/entry_transfer.sql b/db/routines/vn/procedures/entry_transfer.sql
index 9fbf561b23..a5a1277382 100644
--- a/db/routines/vn/procedures/entry_transfer.sql
+++ b/db/routines/vn/procedures/entry_transfer.sql
@@ -1,10 +1,14 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`entry_transfer`(vOriginalEntry INT, OUT vNewEntry INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`entry_transfer`(
+	vOriginalEntry INT,
+	OUT vNewEntry INT
+ )
 BEGIN
 /**
  * Adelanta a mañana la mercancia de una entrada a partir de lo que hay ubicado en el almacén
- * 
+ *
  * @param vOriginalEntry entrada que se quiera adelantar
+ * @param vNewEntry nueva entrada creada
  */
 	DECLARE vNewEntryFk INT;
 	DECLARE vTravelFk INT;
@@ -15,9 +19,9 @@ BEGIN
 		ROLLBACK;
 		RESIGNAL;
 	END;
-	
+
 	-- Clonar la entrada
-	CALL entry_clone(vOriginalEntry,vNewEntryFk);
+	CALL entry_clone(vOriginalEntry, vNewEntryFk);
 
 	START TRANSACTION;
 
@@ -33,7 +37,7 @@ BEGIN
 			SELECT util.VN_CURDATE(),
 					util.VN_CURDATE() + INTERVAL 1 DAY,
 					t.warehouseInFk,
-					t.warehouseInFk,
+					t.warehouseOutFk,
 					t.`ref`,
 					t.isReceived,
 					t.agencyModeFk
@@ -53,15 +57,15 @@ BEGIN
 		WHERE b.entryFk = vNewEntryFk;
 
 	-- Eliminar duplicados
-	DELETE b.*
+	DELETE b
 		FROM buy b
-			LEFT JOIN (SELECT b.id, b.itemFk 
-							FROM buy b 
+			LEFT JOIN (SELECT b.id, b.itemFk
+							FROM buy b
 							WHERE b.entryFk = vNewEntryFk
 							GROUP BY b.itemFk) tBuy ON tBuy.id = b.id
 		WHERE b.entryFk = vNewEntryFk
 			AND tBuy.id IS NULL;
-	
+
 	SELECT t.warehouseInFk INTO vWarehouseFk
 		FROM travel t
 			JOIN entry e ON e.travelFk = t.id
@@ -69,42 +73,50 @@ BEGIN
 
 	-- Actualizar la nueva entrada con lo que no está ubicado HOY, descontando lo vendido HOY de esas ubicaciones
 	CREATE OR REPLACE TEMPORARY TABLE tBuy
-		ENGINE = MEMORY
-		SELECT tBuy.itemFk, IFNULL(iss.visible,0) visible, tBuy.totalQuantity, IFNULL(sales.sold,0) sold
-			FROM (SELECT b.itemFk, SUM(b.quantity) totalQuantity
-						FROM buy b
-						WHERE b.entryFk = vOriginalEntry
-						GROUP BY b.itemFk
-					) tBuy 
-				LEFT JOIN (
-					SELECT ish.itemFk, SUM(visible) visible
-						FROM itemShelving ish
-							JOIN shelving sh ON sh.code = ish.shelvingFk
-							JOIN parking p ON p.id = sh.parkingFk
-							JOIN sector s ON s.id = p.sectorFk
-						WHERE s.warehouseFk = vWarehouseFk
-							AND sh.parked = util.VN_CURDATE()
-						GROUP BY ish.itemFk) iss ON tBuy.itemFk = iss.itemFk
-				LEFT JOIN (
-					SELECT s.itemFk, SUM(s.quantity) sold
-						FROM ticket t
-							JOIN sale s ON s.ticketFk = t.id
-							JOIN itemShelvingSale iss ON iss.saleFk = s.id
-							JOIN itemShelving is2 ON is2.id = iss.itemShelvingFk
-							JOIN shelving s2 ON s2.code = is2.shelvingFk
-						WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
-							AND s2.parked = util.VN_CURDATE()
-						GROUP BY s.itemFk) sales ON sales.itemFk = tBuy.itemFk
-			WHERE visible = tBuy.totalQuantity 
+		WITH tBuy AS (
+			SELECT b.itemFk, SUM(b.quantity) totalQuantity
+				FROM buy b
+				WHERE b.entryFk = vOriginalEntry
+				GROUP BY b.itemFk
+		),
+		itemShelvings AS (
+			SELECT ish.itemFk, SUM(visible) visible
+				FROM itemShelving ish
+					JOIN shelving sh ON sh.code = ish.shelvingFk
+					JOIN parking p ON p.id = sh.parkingFk
+					JOIN sector s ON s.id = p.sectorFk
+				WHERE s.warehouseFk = vWarehouseFk
+					AND sh.parked = util.VN_CURDATE()
+				GROUP BY ish.itemFk
+		),
+		sales AS (
+			SELECT s.itemFk, SUM(s.quantity) sold
+				FROM ticket t
+					JOIN sale s ON s.ticketFk = t.id
+					JOIN itemShelvingSale iss ON iss.saleFk = s.id
+					JOIN itemShelving is2 ON is2.id = iss.itemShelvingFk
+					JOIN shelving s2 ON s2.code = is2.shelvingFk
+				WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
+					AND s2.parked = util.VN_CURDATE()
+				GROUP BY s.itemFk
+		)
+		SELECT tmp.itemFk,
+				IFNULL(iss.visible, 0) visible,
+				tmp.totalQuantity,
+				IFNULL(s.sold, 0) sold
+			FROM tBuy tmp
+				LEFT JOIN itemShelvings iss ON tmp.itemFk = iss.itemFk
+				LEFT JOIN sales s ON s.itemFk = tmp.itemFk
+			WHERE visible = tmp.totalQuantity
 				OR iss.itemFk IS NULL;
 
 	UPDATE buy b
-			JOIN (SELECT * FROM tBuy) sub ON sub.itemFk = b.itemFk
-		SET b.quantity = sub.totalQuantity - sub.visible - sub.sold
+			JOIN tBuy tmp ON tmp.itemFk = b.itemFk
+		SET b.quantity = tmp.totalQuantity - tmp.visible - tmp.sold
 		WHERE b.entryFk = vNewEntryFk;
-	
+
 	-- Limpia la nueva entrada
-	DELETE b.*
+	DELETE b
 		FROM buy b
 		WHERE b.entryFk = vNewEntryFk
 			AND b.quantity = 0;
@@ -113,7 +125,7 @@ BEGIN
 
 	SET vNewEntry = vNewEntryFk;
 
-	CALL cache.visible_refresh(@c,TRUE,7);
-	CALL cache.available_refresh(@c, TRUE, 7, util.VN_CURDATE());
+	CALL cache.visible_refresh(@c,TRUE,vWarehouseFk);
+	CALL cache.available_refresh(@c, TRUE, vWarehouseFk, util.VN_CURDATE());
 END$$
 DELIMITER ;

From be394cec283ee2f8dd5e0d694dbe82867e3a188b Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Thu, 28 Nov 2024 08:17:32 +0100
Subject: [PATCH 13/31] feat: refs #6822 change request

---
 modules/entry/back/methods/entry/transfer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/entry/back/methods/entry/transfer.js b/modules/entry/back/methods/entry/transfer.js
index 53ae4b48c6..425fc6af1e 100644
--- a/modules/entry/back/methods/entry/transfer.js
+++ b/modules/entry/back/methods/entry/transfer.js
@@ -33,7 +33,7 @@ module.exports = Self => {
 
         try {
             await Self.rawSql('CALL vn.entry_transfer(?, @vNewEntry)', [id], myOptions);
-            const newEntryFk = await Self.rawSql('SELECT @vNewEntry AS newEntryFk', [], myOptions);
+            const newEntryFk = await Self.rawSql('SELECT @vNewEntry newEntryFk', [], myOptions);
 
             if (tx) await tx.commit();
             return newEntryFk;

From 3f4aa60cd2fcc4a4ae612aa0dd48c7b2e17c04b9 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Thu, 28 Nov 2024 08:22:30 +0100
Subject: [PATCH 14/31] feat: refs #6822 poner esquemas en el with

---
 db/routines/vn/procedures/entry_transfer.sql | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/db/routines/vn/procedures/entry_transfer.sql b/db/routines/vn/procedures/entry_transfer.sql
index a5a1277382..bd14c4f628 100644
--- a/db/routines/vn/procedures/entry_transfer.sql
+++ b/db/routines/vn/procedures/entry_transfer.sql
@@ -75,27 +75,27 @@ BEGIN
 	CREATE OR REPLACE TEMPORARY TABLE tBuy
 		WITH tBuy AS (
 			SELECT b.itemFk, SUM(b.quantity) totalQuantity
-				FROM buy b
+				FROM vn.buy b
 				WHERE b.entryFk = vOriginalEntry
 				GROUP BY b.itemFk
 		),
 		itemShelvings AS (
 			SELECT ish.itemFk, SUM(visible) visible
-				FROM itemShelving ish
-					JOIN shelving sh ON sh.code = ish.shelvingFk
-					JOIN parking p ON p.id = sh.parkingFk
-					JOIN sector s ON s.id = p.sectorFk
+				FROM vn.itemShelving ish
+					JOIN vn.shelving sh ON sh.code = ish.shelvingFk
+					JOIN vn.parking p ON p.id = sh.parkingFk
+					JOIN vn.sector s ON s.id = p.sectorFk
 				WHERE s.warehouseFk = vWarehouseFk
 					AND sh.parked = util.VN_CURDATE()
 				GROUP BY ish.itemFk
 		),
 		sales AS (
 			SELECT s.itemFk, SUM(s.quantity) sold
-				FROM ticket t
-					JOIN sale s ON s.ticketFk = t.id
-					JOIN itemShelvingSale iss ON iss.saleFk = s.id
-					JOIN itemShelving is2 ON is2.id = iss.itemShelvingFk
-					JOIN shelving s2 ON s2.code = is2.shelvingFk
+				FROM vn.ticket t
+					JOIN vn.sale s ON s.ticketFk = t.id
+					JOIN vn.itemShelvingSale iss ON iss.saleFk = s.id
+					JOIN vn.itemShelving is2 ON is2.id = iss.itemShelvingFk
+					JOIN vn.shelving s2 ON s2.code = is2.shelvingFk
 				WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
 					AND s2.parked = util.VN_CURDATE()
 				GROUP BY s.itemFk

From c518352bf7118d87c87eda2b5df783f8410bb96c Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Wed, 4 Dec 2024 08:12:47 +0100
Subject: [PATCH 15/31] feat: refs #6822 changes required

---
 db/routines/vn/procedures/entry_clone.sql    |  6 ++--
 db/routines/vn/procedures/entry_transfer.sql | 35 +++++++++++++++++---
 2 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/db/routines/vn/procedures/entry_clone.sql b/db/routines/vn/procedures/entry_clone.sql
index 12738af545..c7cbf1f7b2 100644
--- a/db/routines/vn/procedures/entry_clone.sql
+++ b/db/routines/vn/procedures/entry_clone.sql
@@ -1,14 +1,14 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`vn`@`localhost` PROCEDURE `vn`.`entry_clone`(
 	vSelf INT,
-	OUT newEntryFk INT
+	OUT vOutputEntryFk INT
 )
 BEGIN
 /**
  * clones an entry.
  *
  * @param vSelf The entry id
- * @param newEntryFk Output parameter of the new created input
+ * @param vOutputEntryFk The new entry id
  */
 	DECLARE vNewEntryFk INT;
 
@@ -24,7 +24,7 @@ BEGIN
 	CALL entry_copyBuys(vSelf, vNewEntryFk);
 
 	COMMIT;
-	SET newEntryFk = vNewEntryFk;
+	SET vOutputEntryFk = vNewEntryFk;
 
 END$$
 DELIMITER ;
diff --git a/db/routines/vn/procedures/entry_transfer.sql b/db/routines/vn/procedures/entry_transfer.sql
index bd14c4f628..7943f738f9 100644
--- a/db/routines/vn/procedures/entry_transfer.sql
+++ b/db/routines/vn/procedures/entry_transfer.sql
@@ -13,6 +13,12 @@ BEGIN
 	DECLARE vNewEntryFk INT;
 	DECLARE vTravelFk INT;
 	DECLARE vWarehouseFk INT;
+	DECLARE vWarehouseInFk INT;
+	DECLARE vWarehouseOutFk INT;
+	DECLARE vRef INT;
+	DECLARE vIsReceived INT;
+	DECLARE vAgencyModeFk INT;
+	DECLARE vNewTravelFk INT;
 
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 	BEGIN
@@ -26,7 +32,25 @@ BEGIN
 	START TRANSACTION;
 
 	-- Hay que crear un nuevo travel, con salida hoy y llegada mañana y asignar la entrada nueva al nuevo travel.
-	INSERT INTO travel(
+	SELECT warehouseInFk,warehouseOutFk,`ref`,isReceived ,agencyModeFk
+		INTO vWarehouseInFk,vWarehouseOutFk, vRef,vIsReceived, vAgencyModeFk
+		FROM travel t
+			JOIN entry e ON e.travelFk = t.id
+		WHERE e.id = 1;
+
+	SELECT t.di INTO vNewTravelFk
+		FROM travel t
+			JOIN entry e ON e.travelFk = t.id
+		WHERE t.shipped = util.VN_CURDATE()
+			AND t.landed = util.VN_CURDATE() + INTERVAL 1 DAY
+			AND warehouseInFk = vWarehouseInFk
+			AND warehouseOutFk = vWarehouseOutFk
+			AND `ref` = vRef
+			AND isReceived =vIsReceived
+			AND agencyModeFk = vAgencyModeFk;
+
+	IF NOT vNewTravelFk THEN
+			INSERT INTO travel(
 				shipped,
 				landed,
 				warehouseInFk,
@@ -45,7 +69,10 @@ BEGIN
 					JOIN entry e ON e.travelFk = t.id
 				WHERE e.id = vOriginalEntry;
 
-	SET vTravelFk = LAST_INSERT_ID();
+		SET vTravelFk = LAST_INSERT_ID();
+	ELSE
+		SET vTravelFk = vNewTravelFk;
+	END IF;
 
 	UPDATE entry
 		SET travelFk = vTravelFk
@@ -82,7 +109,7 @@ BEGIN
 		itemShelvings AS (
 			SELECT ish.itemFk, SUM(visible) visible
 				FROM vn.itemShelving ish
-					JOIN vn.shelving sh ON sh.code = ish.shelvingFk
+					JOIN vn.shelving sh ON sh.id = ish.shelvingFk
 					JOIN vn.parking p ON p.id = sh.parkingFk
 					JOIN vn.sector s ON s.id = p.sectorFk
 				WHERE s.warehouseFk = vWarehouseFk
@@ -95,7 +122,7 @@ BEGIN
 					JOIN vn.sale s ON s.ticketFk = t.id
 					JOIN vn.itemShelvingSale iss ON iss.saleFk = s.id
 					JOIN vn.itemShelving is2 ON is2.id = iss.itemShelvingFk
-					JOIN vn.shelving s2 ON s2.code = is2.shelvingFk
+					JOIN vn.shelving s2 ON s2.id = is2.shelvingFk
 				WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
 					AND s2.parked = util.VN_CURDATE()
 				GROUP BY s.itemFk

From b97b61c7dd8304193e5af7a279c9d62270ed9de5 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Wed, 4 Dec 2024 09:40:28 +0100
Subject: [PATCH 16/31] feat: refs #6822 fix

---
 db/routines/vn/procedures/entry_transfer.sql | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/db/routines/vn/procedures/entry_transfer.sql b/db/routines/vn/procedures/entry_transfer.sql
index 7943f738f9..1aa2841ce9 100644
--- a/db/routines/vn/procedures/entry_transfer.sql
+++ b/db/routines/vn/procedures/entry_transfer.sql
@@ -36,9 +36,9 @@ BEGIN
 		INTO vWarehouseInFk,vWarehouseOutFk, vRef,vIsReceived, vAgencyModeFk
 		FROM travel t
 			JOIN entry e ON e.travelFk = t.id
-		WHERE e.id = 1;
+		WHERE e.id = vOriginalEntry;
 
-	SELECT t.di INTO vNewTravelFk
+	SELECT t.id INTO vNewTravelFk
 		FROM travel t
 			JOIN entry e ON e.travelFk = t.id
 		WHERE t.shipped = util.VN_CURDATE()
@@ -49,7 +49,7 @@ BEGIN
 			AND isReceived =vIsReceived
 			AND agencyModeFk = vAgencyModeFk;
 
-	IF NOT vNewTravelFk THEN
+	IF vNewTravelFk IS NULL THEN
 			INSERT INTO travel(
 				shipped,
 				landed,
@@ -113,7 +113,7 @@ BEGIN
 					JOIN vn.parking p ON p.id = sh.parkingFk
 					JOIN vn.sector s ON s.id = p.sectorFk
 				WHERE s.warehouseFk = vWarehouseFk
-					AND sh.parked = util.VN_CURDATE()
+					AND sh.parked BETWEEN CURDATE() AND util.dayend(CURDATE())
 				GROUP BY ish.itemFk
 		),
 		sales AS (
@@ -124,7 +124,7 @@ BEGIN
 					JOIN vn.itemShelving is2 ON is2.id = iss.itemShelvingFk
 					JOIN vn.shelving s2 ON s2.id = is2.shelvingFk
 				WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
-					AND s2.parked = util.VN_CURDATE()
+					AND s2.parked BETWEEN CURDATE() AND util.dayend(CURDATE())
 				GROUP BY s.itemFk
 		)
 		SELECT tmp.itemFk,
@@ -134,7 +134,7 @@ BEGIN
 			FROM tBuy tmp
 				LEFT JOIN itemShelvings iss ON tmp.itemFk = iss.itemFk
 				LEFT JOIN sales s ON s.itemFk = tmp.itemFk
-			WHERE visible = tmp.totalQuantity
+			WHERE visible < tmp.totalQuantity
 				OR iss.itemFk IS NULL;
 
 	UPDATE buy b

From 6ac30dcb0c11bf1e9289460c875569a8cb4dcde2 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Wed, 4 Dec 2024 13:32:10 +0100
Subject: [PATCH 17/31] feat: refs #6822 fix conflict

---
 db/routines/vn/procedures/entry_transfer.sql | 7 ++++---
 modules/entry/back/models/entry.js           | 1 -
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/db/routines/vn/procedures/entry_transfer.sql b/db/routines/vn/procedures/entry_transfer.sql
index 1aa2841ce9..6e96076914 100644
--- a/db/routines/vn/procedures/entry_transfer.sql
+++ b/db/routines/vn/procedures/entry_transfer.sql
@@ -75,7 +75,8 @@ BEGIN
 	END IF;
 
 	UPDATE entry
-		SET travelFk = vTravelFk
+		SET travelFk = vTravelFk,
+			evaNotes = vOriginalEntry
 		WHERE id = vNewEntryFk;
 
 	-- Poner a 0 las cantidades
@@ -113,7 +114,7 @@ BEGIN
 					JOIN vn.parking p ON p.id = sh.parkingFk
 					JOIN vn.sector s ON s.id = p.sectorFk
 				WHERE s.warehouseFk = vWarehouseFk
-					AND sh.parked BETWEEN CURDATE() AND util.dayend(CURDATE())
+					AND sh.parked >= util.VN_CURDATE()
 				GROUP BY ish.itemFk
 		),
 		sales AS (
@@ -124,7 +125,7 @@ BEGIN
 					JOIN vn.itemShelving is2 ON is2.id = iss.itemShelvingFk
 					JOIN vn.shelving s2 ON s2.id = is2.shelvingFk
 				WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
-					AND s2.parked BETWEEN CURDATE() AND util.dayend(CURDATE())
+					AND s2.parked >= util.VN_CURDATE()
 				GROUP BY s.itemFk
 		)
 		SELECT tmp.itemFk,
diff --git a/modules/entry/back/models/entry.js b/modules/entry/back/models/entry.js
index 56ff69bf5e..03cbd6e7f9 100644
--- a/modules/entry/back/models/entry.js
+++ b/modules/entry/back/models/entry.js
@@ -13,7 +13,6 @@ module.exports = Self => {
     require('../methods/entry/addFromBuy')(Self);
     require('../methods/entry/buyLabel')(Self);
     require('../methods/entry/transfer')(Self);
-    require('../methods/entry/print')(Self);
     require('../methods/entry/labelSupplier')(Self);
     require('../methods/entry/buyLabelSupplier')(Self);
 

From 43bbdfd4215a308e4f41fc1815ae403d1b2f48a2 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Wed, 11 Dec 2024 11:54:40 +0100
Subject: [PATCH 18/31] feat: refs #6822

---
 db/routines/vn/procedures/entry_transfer.sql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/db/routines/vn/procedures/entry_transfer.sql b/db/routines/vn/procedures/entry_transfer.sql
index 6e96076914..98ddf3ef5f 100644
--- a/db/routines/vn/procedures/entry_transfer.sql
+++ b/db/routines/vn/procedures/entry_transfer.sql
@@ -113,6 +113,8 @@ BEGIN
 					JOIN vn.shelving sh ON sh.id = ish.shelvingFk
 					JOIN vn.parking p ON p.id = sh.parkingFk
 					JOIN vn.sector s ON s.id = p.sectorFk
+					JOIN vn.buy b ON b.id = ish.buyFk
+					JOIN vn.entry e ON e.id = b.entryFk
 				WHERE s.warehouseFk = vWarehouseFk
 					AND sh.parked >= util.VN_CURDATE()
 				GROUP BY ish.itemFk

From ab1eed66df04760db013af5f2f4fc832a8dcd647 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Fri, 13 Dec 2024 12:29:03 +0100
Subject: [PATCH 19/31] feat: refs #6822 changes required

---
 db/routines/vn/procedures/entry_transfer.sql | 21 ++++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/db/routines/vn/procedures/entry_transfer.sql b/db/routines/vn/procedures/entry_transfer.sql
index 98ddf3ef5f..c368e1e55f 100644
--- a/db/routines/vn/procedures/entry_transfer.sql
+++ b/db/routines/vn/procedures/entry_transfer.sql
@@ -18,7 +18,7 @@ BEGIN
 	DECLARE vRef INT;
 	DECLARE vIsReceived INT;
 	DECLARE vAgencyModeFk INT;
-	DECLARE vNewTravelFk INT;
+	DECLARE vTomorrow DATETIME DEFAULT util.tomorrow();
 
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 	BEGIN
@@ -32,24 +32,23 @@ BEGIN
 	START TRANSACTION;
 
 	-- Hay que crear un nuevo travel, con salida hoy y llegada mañana y asignar la entrada nueva al nuevo travel.
-	SELECT warehouseInFk,warehouseOutFk,`ref`,isReceived ,agencyModeFk
-		INTO vWarehouseInFk,vWarehouseOutFk, vRef,vIsReceived, vAgencyModeFk
+	SELECT t.warehouseInFk, t.warehouseOutFk, t.`ref`, t.isReceived, t.agencyModeFk
+		INTO vWarehouseInFk, vWarehouseOutFk, vRef, vIsReceived, vAgencyModeFk
 		FROM travel t
 			JOIN entry e ON e.travelFk = t.id
 		WHERE e.id = vOriginalEntry;
 
-	SELECT t.id INTO vNewTravelFk
+	SELECT id INTO vTravelFk
 		FROM travel t
-			JOIN entry e ON e.travelFk = t.id
-		WHERE t.shipped = util.VN_CURDATE()
-			AND t.landed = util.VN_CURDATE() + INTERVAL 1 DAY
+		WHERE shipped = util.VN_CURDATE()
+			AND landed = vTomorrow
 			AND warehouseInFk = vWarehouseInFk
 			AND warehouseOutFk = vWarehouseOutFk
 			AND `ref` = vRef
 			AND isReceived =vIsReceived
 			AND agencyModeFk = vAgencyModeFk;
 
-	IF vNewTravelFk IS NULL THEN
+	IF vTravelFk IS NULL THEN
 			INSERT INTO travel(
 				shipped,
 				landed,
@@ -59,7 +58,7 @@ BEGIN
 				isReceived,
 				agencyModeFk)
 			SELECT util.VN_CURDATE(),
-					util.VN_CURDATE() + INTERVAL 1 DAY,
+					vTomorrow,
 					t.warehouseInFk,
 					t.warehouseOutFk,
 					t.`ref`,
@@ -70,8 +69,6 @@ BEGIN
 				WHERE e.id = vOriginalEntry;
 
 		SET vTravelFk = LAST_INSERT_ID();
-	ELSE
-		SET vTravelFk = vNewTravelFk;
 	END IF;
 
 	UPDATE entry
@@ -115,6 +112,7 @@ BEGIN
 					JOIN vn.sector s ON s.id = p.sectorFk
 					JOIN vn.buy b ON b.id = ish.buyFk
 					JOIN vn.entry e ON e.id = b.entryFk
+					JOIN tBuy t ON t.itemFk = ish.itemFk
 				WHERE s.warehouseFk = vWarehouseFk
 					AND sh.parked >= util.VN_CURDATE()
 				GROUP BY ish.itemFk
@@ -126,6 +124,7 @@ BEGIN
 					JOIN vn.itemShelvingSale iss ON iss.saleFk = s.id
 					JOIN vn.itemShelving is2 ON is2.id = iss.itemShelvingFk
 					JOIN vn.shelving s2 ON s2.id = is2.shelvingFk
+					JOIN tBuy t ON t.itemFk = s.itemFk
 				WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
 					AND s2.parked >= util.VN_CURDATE()
 				GROUP BY s.itemFk

From 02d77324b170271d88231a57334eadd6a7eebd26 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Fri, 3 Jan 2025 08:27:34 +0100
Subject: [PATCH 20/31] feat: refs #6822 crear test

---
 db/routines/vn/procedures/entry_transfer.sql  | 16 ++++------
 .../back/methods/entry/specs/transfer.spec.js | 30 +++++++++++++++++++
 modules/entry/back/methods/entry/transfer.js  |  2 +-
 3 files changed, 36 insertions(+), 12 deletions(-)
 create mode 100644 modules/entry/back/methods/entry/specs/transfer.spec.js

diff --git a/db/routines/vn/procedures/entry_transfer.sql b/db/routines/vn/procedures/entry_transfer.sql
index c368e1e55f..63f3f14ab9 100644
--- a/db/routines/vn/procedures/entry_transfer.sql
+++ b/db/routines/vn/procedures/entry_transfer.sql
@@ -1,7 +1,7 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`entry_transfer`(
 	vOriginalEntry INT,
-	OUT vNewEntry INT
+	OUT vNewEntryFk INT
  )
 BEGIN
 /**
@@ -10,7 +10,6 @@ BEGIN
  * @param vOriginalEntry entrada que se quiera adelantar
  * @param vNewEntry nueva entrada creada
  */
-	DECLARE vNewEntryFk INT;
 	DECLARE vTravelFk INT;
 	DECLARE vWarehouseFk INT;
 	DECLARE vWarehouseInFk INT;
@@ -97,7 +96,7 @@ BEGIN
 		WHERE e.id = vOriginalEntry;
 
 	-- Actualizar la nueva entrada con lo que no está ubicado HOY, descontando lo vendido HOY de esas ubicaciones
-	CREATE OR REPLACE TEMPORARY TABLE tBuy
+	CREATE OR REPLACE TEMPORARY TABLE buys
 		WITH tBuy AS (
 			SELECT b.itemFk, SUM(b.quantity) totalQuantity
 				FROM vn.buy b
@@ -105,7 +104,7 @@ BEGIN
 				GROUP BY b.itemFk
 		),
 		itemShelvings AS (
-			SELECT ish.itemFk, SUM(visible) visible
+			SELECT ish.itemFk, SUM(ish.visible) visible
 				FROM vn.itemShelving ish
 					JOIN vn.shelving sh ON sh.id = ish.shelvingFk
 					JOIN vn.parking p ON p.id = sh.parkingFk
@@ -140,20 +139,15 @@ BEGIN
 				OR iss.itemFk IS NULL;
 
 	UPDATE buy b
-			JOIN tBuy tmp ON tmp.itemFk = b.itemFk
+			JOIN buys tmp ON tmp.itemFk = b.itemFk
 		SET b.quantity = tmp.totalQuantity - tmp.visible - tmp.sold
 		WHERE b.entryFk = vNewEntryFk;
 
 	-- Limpia la nueva entrada
-	DELETE b
-		FROM buy b
-		WHERE b.entryFk = vNewEntryFk
-			AND b.quantity = 0;
+	DELETE FROM buy WHERE entryFk = vNewEntryFk AND quantity = 0;
 
 	COMMIT;
 
-	SET vNewEntry = vNewEntryFk;
-
 	CALL cache.visible_refresh(@c,TRUE,vWarehouseFk);
 	CALL cache.available_refresh(@c, TRUE, vWarehouseFk, util.VN_CURDATE());
 END$$
diff --git a/modules/entry/back/methods/entry/specs/transfer.spec.js b/modules/entry/back/methods/entry/specs/transfer.spec.js
new file mode 100644
index 0000000000..3a223a3354
--- /dev/null
+++ b/modules/entry/back/methods/entry/specs/transfer.spec.js
@@ -0,0 +1,30 @@
+const transfer = require('../transfer');
+
+const models = require('vn-loopback/server/server').models;
+
+describe('Transfer merchandise from one entry to the next day()', () => {
+    const ctx = {req: {accessToken: {userId: 18}}};
+
+    it('should Transfer buys not located', async() => {
+        const id = 3;
+        const item = 8;
+        const buy = 6;
+        const originalEntry = 4;
+
+        const tx = await models.ItemShelving.beginTransaction({});
+        const options = {transaction: tx};
+        try {
+            const currentItemShelving = await models.ItemShelving.findOne({where: {id}}, options);
+            await currentItemShelving.updateAttributes({itemFk: item, buyFk: buy}, options);
+            const result = await models.Entry.transfer(ctx, originalEntry, options);
+            const buys = await models.Buy.find({where: {entryFk: result[0].newEntryFk}}, options);
+
+            expect(buys.length).toEqual(3);
+
+            await tx.rollback();
+        } catch (e) {
+            await tx.rollback();
+            throw e;
+        }
+    });
+});
diff --git a/modules/entry/back/methods/entry/transfer.js b/modules/entry/back/methods/entry/transfer.js
index 425fc6af1e..1c5f38c215 100644
--- a/modules/entry/back/methods/entry/transfer.js
+++ b/modules/entry/back/methods/entry/transfer.js
@@ -1,6 +1,6 @@
 module.exports = Self => {
     Self.remoteMethodCtx('transfer', {
-        description: 'Trasladar la mercancia de una entrada al dia siguiente',
+        description: 'Transfer merchandise from one entry to the next day',
         accepts: [
             {
                 arg: 'id',

From 04734ac55c5bf0bef6481ea3448b0609fd51fb11 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Tue, 7 Jan 2025 08:59:47 +0100
Subject: [PATCH 21/31] feat: refs #6822 test transfer

---
 .../back/methods/entry/specs/transfer.spec.js | 40 +++++++++++++------
 modules/entry/back/models/buy.json            |  7 +++-
 modules/item/back/models/item-shelving.json   |  9 ++++-
 3 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/modules/entry/back/methods/entry/specs/transfer.spec.js b/modules/entry/back/methods/entry/specs/transfer.spec.js
index 3a223a3354..3efd081d78 100644
--- a/modules/entry/back/methods/entry/specs/transfer.spec.js
+++ b/modules/entry/back/methods/entry/specs/transfer.spec.js
@@ -1,25 +1,41 @@
-const transfer = require('../transfer');
+// const transfer = require('../transfer');
 
 const models = require('vn-loopback/server/server').models;
 
 describe('Transfer merchandise from one entry to the next day()', () => {
-    const ctx = {req: {accessToken: {userId: 18}}};
-
-    it('should Transfer buys not located', async() => {
-        const id = 3;
-        const item = 8;
-        const buy = 6;
-        const originalEntry = 4;
-
+    fit('should Transfer buys not located', async() => {
         const tx = await models.ItemShelving.beginTransaction({});
         const options = {transaction: tx};
+
         try {
+            const id = 3;
+            const item = 8;
+            const buy = 6;
+            const originalEntry = 4;
+            const ctx = {req: {accessToken: {userId: 48}}};
+
             const currentItemShelving = await models.ItemShelving.findOne({where: {id}}, options);
             await currentItemShelving.updateAttributes({itemFk: item, buyFk: buy}, options);
-            const result = await models.Entry.transfer(ctx, originalEntry, options);
-            const buys = await models.Buy.find({where: {entryFk: result[0].newEntryFk}}, options);
 
-            expect(buys.length).toEqual(3);
+            const result = await models.Entry.transfer(ctx, originalEntry, options);
+
+            const originalEntrybuys = await models.Buy.find({where: {entryFk: originalEntry}}, options);
+
+            const newEntrybuys = await models.Buy.find({where: {entryFk: result[0].newEntryFk}}, options);
+
+            const itemShelvingsWithBuys = await models.Buy.find({
+                include: {
+                    relation: 'itemShelving',
+                    scope: {
+                        fields: ['id'],
+                    },
+                },
+                where: {entryFk: originalEntry},
+            }, options);
+
+            const hasItemShelving = await itemShelvingsWithBuys.filter(buy => buy.itemShelving().length);
+
+            expect(newEntrybuys.length).toEqual(originalEntrybuys.length - hasItemShelving.length);
 
             await tx.rollback();
         } catch (e) {
diff --git a/modules/entry/back/models/buy.json b/modules/entry/back/models/buy.json
index 14cafde06b..cd1e54de73 100644
--- a/modules/entry/back/models/buy.json
+++ b/modules/entry/back/models/buy.json
@@ -114,6 +114,11 @@
 			"type": "belongsTo",
 			"model": "Delivery",
 			"foreignKey": "deliveryFk"
-		}
+		},
+        "itemShelving": {
+            "type": "hasMany",
+            "model": "ItemShelving",
+            "foreignKey": "buyFk"
+        }
     }
 }
diff --git a/modules/item/back/models/item-shelving.json b/modules/item/back/models/item-shelving.json
index 483d6bf3dc..5c31e9e4e1 100644
--- a/modules/item/back/models/item-shelving.json
+++ b/modules/item/back/models/item-shelving.json
@@ -61,6 +61,11 @@
 			"type": "belongsTo",
 			"model": "Shelving",
 			"foreignKey": "shelvingFk"
-		}
+		},
+        "buy": {
+            "type": "belongsTo",
+            "model": "Buy",
+            "foreignKey": "buyFk"
+        }
 	}
-}
\ No newline at end of file
+}

From b7658f5814a98ba5aa06ca6ed50ac18c9741074e Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Tue, 7 Jan 2025 09:28:17 +0100
Subject: [PATCH 22/31] feat: refs #6822 fix test

---
 modules/entry/back/methods/entry/specs/transfer.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/entry/back/methods/entry/specs/transfer.spec.js b/modules/entry/back/methods/entry/specs/transfer.spec.js
index 3efd081d78..e4f4747c67 100644
--- a/modules/entry/back/methods/entry/specs/transfer.spec.js
+++ b/modules/entry/back/methods/entry/specs/transfer.spec.js
@@ -3,7 +3,7 @@
 const models = require('vn-loopback/server/server').models;
 
 describe('Transfer merchandise from one entry to the next day()', () => {
-    fit('should Transfer buys not located', async() => {
+    it('should Transfer buys not located', async() => {
         const tx = await models.ItemShelving.beginTransaction({});
         const options = {transaction: tx};
 

From ebf234dd4fbeca5c484bf2653ae6ab96e2213053 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Tue, 7 Jan 2025 09:49:55 +0100
Subject: [PATCH 23/31] feat: refs #6822 delete fixtures to test

---
 modules/entry/back/methods/entry/specs/transfer.spec.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/entry/back/methods/entry/specs/transfer.spec.js b/modules/entry/back/methods/entry/specs/transfer.spec.js
index e4f4747c67..0ab35e4a31 100644
--- a/modules/entry/back/methods/entry/specs/transfer.spec.js
+++ b/modules/entry/back/methods/entry/specs/transfer.spec.js
@@ -23,6 +23,8 @@ describe('Transfer merchandise from one entry to the next day()', () => {
 
             const newEntrybuys = await models.Buy.find({where: {entryFk: result[0].newEntryFk}}, options);
 
+            const newTravel = await models.Entry.find({where: {id: result[0].newEntryFk}}, options);
+
             const itemShelvingsWithBuys = await models.Buy.find({
                 include: {
                     relation: 'itemShelving',
@@ -37,6 +39,9 @@ describe('Transfer merchandise from one entry to the next day()', () => {
 
             expect(newEntrybuys.length).toEqual(originalEntrybuys.length - hasItemShelving.length);
 
+            await models.Travel.destroyById(newTravel, options);
+            await models.Entry.destroyById(result[0].newEntryFk, options);
+
             await tx.rollback();
         } catch (e) {
             await tx.rollback();

From c4c9b5640ec50496af87decbcf56bbe14dfd4f50 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Tue, 7 Jan 2025 12:02:32 +0100
Subject: [PATCH 24/31] feat: refs #6822 modify transaction

---
 db/routines/vn/procedures/entry_clone.sql              |  7 ++++---
 db/routines/vn/procedures/entry_transfer.sql           |  8 +++++---
 .../entry/back/methods/entry/specs/transfer.spec.js    | 10 +++-------
 modules/entry/back/methods/entry/transfer.js           |  2 +-
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/db/routines/vn/procedures/entry_clone.sql b/db/routines/vn/procedures/entry_clone.sql
index c7cbf1f7b2..511ff4837f 100644
--- a/db/routines/vn/procedures/entry_clone.sql
+++ b/db/routines/vn/procedures/entry_clone.sql
@@ -12,18 +12,19 @@ BEGIN
  */
 	DECLARE vNewEntryFk INT;
 
+	DECLARE vIsRequiredTx BOOL DEFAULT NOT @@in_transaction;
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 	BEGIN
-		ROLLBACK;
+		CALL util.tx_rollback(vIsRequiredTx);
 		RESIGNAL;
 	END;
 
-	START TRANSACTION;
+	CALL util.tx_start(vIsRequiredTx);
 
 	CALL entry_cloneHeader(vSelf, vNewEntryFk, NULL);
 	CALL entry_copyBuys(vSelf, vNewEntryFk);
 
-	COMMIT;
+	CALL util.tx_commit(vIsRequiredTx);
 	SET vOutputEntryFk = vNewEntryFk;
 
 END$$
diff --git a/db/routines/vn/procedures/entry_transfer.sql b/db/routines/vn/procedures/entry_transfer.sql
index 63f3f14ab9..1234700387 100644
--- a/db/routines/vn/procedures/entry_transfer.sql
+++ b/db/routines/vn/procedures/entry_transfer.sql
@@ -19,16 +19,18 @@ BEGIN
 	DECLARE vAgencyModeFk INT;
 	DECLARE vTomorrow DATETIME DEFAULT util.tomorrow();
 
+	DECLARE vIsRequiredTx BOOL DEFAULT NOT @@in_transaction;
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
 	BEGIN
-		ROLLBACK;
+		CALL util.tx_rollback(vIsRequiredTx);
 		RESIGNAL;
 	END;
 
 	-- Clonar la entrada
 	CALL entry_clone(vOriginalEntry, vNewEntryFk);
 
-	START TRANSACTION;
+	CALL util.tx_start(vIsRequiredTx);
+
 
 	-- Hay que crear un nuevo travel, con salida hoy y llegada mañana y asignar la entrada nueva al nuevo travel.
 	SELECT t.warehouseInFk, t.warehouseOutFk, t.`ref`, t.isReceived, t.agencyModeFk
@@ -146,7 +148,7 @@ BEGIN
 	-- Limpia la nueva entrada
 	DELETE FROM buy WHERE entryFk = vNewEntryFk AND quantity = 0;
 
-	COMMIT;
+	CALL util.tx_commit(vIsRequiredTx);
 
 	CALL cache.visible_refresh(@c,TRUE,vWarehouseFk);
 	CALL cache.available_refresh(@c, TRUE, vWarehouseFk, util.VN_CURDATE());
diff --git a/modules/entry/back/methods/entry/specs/transfer.spec.js b/modules/entry/back/methods/entry/specs/transfer.spec.js
index 0ab35e4a31..74e89df460 100644
--- a/modules/entry/back/methods/entry/specs/transfer.spec.js
+++ b/modules/entry/back/methods/entry/specs/transfer.spec.js
@@ -17,13 +17,12 @@ describe('Transfer merchandise from one entry to the next day()', () => {
             const currentItemShelving = await models.ItemShelving.findOne({where: {id}}, options);
             await currentItemShelving.updateAttributes({itemFk: item, buyFk: buy}, options);
 
-            const result = await models.Entry.transfer(ctx, originalEntry, options);
-
+            const [{newEntryFk}] = await models.Entry.transfer(ctx, originalEntry, options);
             const originalEntrybuys = await models.Buy.find({where: {entryFk: originalEntry}}, options);
 
-            const newEntrybuys = await models.Buy.find({where: {entryFk: result[0].newEntryFk}}, options);
+            const newEntrybuys = await models.Buy.find({where: {entryFk: newEntryFk}}, options);
 
-            const newTravel = await models.Entry.find({where: {id: result[0].newEntryFk}}, options);
+            await models.Entry.find({where: {id: newEntryFk}}, options);
 
             const itemShelvingsWithBuys = await models.Buy.find({
                 include: {
@@ -39,9 +38,6 @@ describe('Transfer merchandise from one entry to the next day()', () => {
 
             expect(newEntrybuys.length).toEqual(originalEntrybuys.length - hasItemShelving.length);
 
-            await models.Travel.destroyById(newTravel, options);
-            await models.Entry.destroyById(result[0].newEntryFk, options);
-
             await tx.rollback();
         } catch (e) {
             await tx.rollback();
diff --git a/modules/entry/back/methods/entry/transfer.js b/modules/entry/back/methods/entry/transfer.js
index 1c5f38c215..aa4b4c8192 100644
--- a/modules/entry/back/methods/entry/transfer.js
+++ b/modules/entry/back/methods/entry/transfer.js
@@ -33,7 +33,7 @@ module.exports = Self => {
 
         try {
             await Self.rawSql('CALL vn.entry_transfer(?, @vNewEntry)', [id], myOptions);
-            const newEntryFk = await Self.rawSql('SELECT @vNewEntry newEntryFk', [], myOptions);
+            const newEntryFk = await Self.rawSql('SELECT @vNewEntry newEntryFk', null, myOptions);
 
             if (tx) await tx.commit();
             return newEntryFk;

From 115756aaf3b71300ebd604588478f9f2266597e3 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Wed, 8 Jan 2025 07:44:49 +0100
Subject: [PATCH 25/31] feat: refs #6822 fix transfer test

---
 modules/entry/back/methods/entry/specs/transfer.spec.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/modules/entry/back/methods/entry/specs/transfer.spec.js b/modules/entry/back/methods/entry/specs/transfer.spec.js
index 74e89df460..cc712b9949 100644
--- a/modules/entry/back/methods/entry/specs/transfer.spec.js
+++ b/modules/entry/back/methods/entry/specs/transfer.spec.js
@@ -1,5 +1,3 @@
-// const transfer = require('../transfer');
-
 const models = require('vn-loopback/server/server').models;
 
 describe('Transfer merchandise from one entry to the next day()', () => {
@@ -22,8 +20,6 @@ describe('Transfer merchandise from one entry to the next day()', () => {
 
             const newEntrybuys = await models.Buy.find({where: {entryFk: newEntryFk}}, options);
 
-            await models.Entry.find({where: {id: newEntryFk}}, options);
-
             const itemShelvingsWithBuys = await models.Buy.find({
                 include: {
                     relation: 'itemShelving',

From e92e1d3a46162a24a6464c9a3a429b36c9070176 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Wed, 22 Jan 2025 13:20:24 +0100
Subject: [PATCH 27/31] feat: refs #6822 refs #688 change request

---
 db/routines/vn/procedures/entry_transfer.sql | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/db/routines/vn/procedures/entry_transfer.sql b/db/routines/vn/procedures/entry_transfer.sql
index 1234700387..bb1ef97be8 100644
--- a/db/routines/vn/procedures/entry_transfer.sql
+++ b/db/routines/vn/procedures/entry_transfer.sql
@@ -31,8 +31,7 @@ BEGIN
 
 	CALL util.tx_start(vIsRequiredTx);
 
-
-	-- Hay que crear un nuevo travel, con salida hoy y llegada mañana y asignar la entrada nueva al nuevo travel.
+	-- Nuevo travel, salida hoy y llegada mañana, asignar la entrada nueva al nuevo travel.
 	SELECT t.warehouseInFk, t.warehouseOutFk, t.`ref`, t.isReceived, t.agencyModeFk
 		INTO vWarehouseInFk, vWarehouseOutFk, vRef, vIsReceived, vAgencyModeFk
 		FROM travel t

From 0f531d4b745671287067c9f32d006486b64fa3f1 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Wed, 22 Jan 2025 13:24:06 +0100
Subject: [PATCH 28/31] feat: refs #6822 change request

---
 db/routines/vn/procedures/entry_transfer.sql | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/db/routines/vn/procedures/entry_transfer.sql b/db/routines/vn/procedures/entry_transfer.sql
index bb1ef97be8..7e38e5095c 100644
--- a/db/routines/vn/procedures/entry_transfer.sql
+++ b/db/routines/vn/procedures/entry_transfer.sql
@@ -31,7 +31,8 @@ BEGIN
 
 	CALL util.tx_start(vIsRequiredTx);
 
-	-- Nuevo travel, salida hoy y llegada mañana, asignar la entrada nueva al nuevo travel.
+	/* Hay que crear un nuevo travel, con salida hoy y llegada mañana y
+		asignar la entrada nueva al nuevo travel.*/
 	SELECT t.warehouseInFk, t.warehouseOutFk, t.`ref`, t.isReceived, t.agencyModeFk
 		INTO vWarehouseInFk, vWarehouseOutFk, vRef, vIsReceived, vAgencyModeFk
 		FROM travel t
@@ -96,7 +97,8 @@ BEGIN
 			JOIN entry e ON e.travelFk = t.id
 		WHERE e.id = vOriginalEntry;
 
-	-- Actualizar la nueva entrada con lo que no está ubicado HOY, descontando lo vendido HOY de esas ubicaciones
+	/* Actualizar nueva entrada con lo que no está ubicado HOY,
+		descontando lo vendido HOY de esas ubicaciones*/
 	CREATE OR REPLACE TEMPORARY TABLE buys
 		WITH tBuy AS (
 			SELECT b.itemFk, SUM(b.quantity) totalQuantity

From d8847d3d09822ea377cc315156031ebf05a62de3 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Thu, 23 Jan 2025 12:59:32 +0100
Subject: [PATCH 29/31] feat: refs #6822 change request

---
 db/routines/vn/procedures/entry_transfer.sql | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/db/routines/vn/procedures/entry_transfer.sql b/db/routines/vn/procedures/entry_transfer.sql
index 7e38e5095c..5b83ae5321 100644
--- a/db/routines/vn/procedures/entry_transfer.sql
+++ b/db/routines/vn/procedures/entry_transfer.sql
@@ -18,6 +18,7 @@ BEGIN
 	DECLARE vIsReceived INT;
 	DECLARE vAgencyModeFk INT;
 	DECLARE vTomorrow DATETIME DEFAULT util.tomorrow();
+	DECLARE vCurDate DATE DEFAULT util.VN_CURDATE();
 
 	DECLARE vIsRequiredTx BOOL DEFAULT NOT @@in_transaction;
 	DECLARE EXIT HANDLER FOR SQLEXCEPTION
@@ -41,7 +42,7 @@ BEGIN
 
 	SELECT id INTO vTravelFk
 		FROM travel t
-		WHERE shipped = util.VN_CURDATE()
+		WHERE shipped = vCurDate
 			AND landed = vTomorrow
 			AND warehouseInFk = vWarehouseInFk
 			AND warehouseOutFk = vWarehouseOutFk
@@ -58,7 +59,7 @@ BEGIN
 				`ref`,
 				isReceived,
 				agencyModeFk)
-			SELECT util.VN_CURDATE(),
+			SELECT vCurDate,
 					vTomorrow,
 					t.warehouseInFk,
 					t.warehouseOutFk,
@@ -116,7 +117,7 @@ BEGIN
 					JOIN vn.entry e ON e.id = b.entryFk
 					JOIN tBuy t ON t.itemFk = ish.itemFk
 				WHERE s.warehouseFk = vWarehouseFk
-					AND sh.parked >= util.VN_CURDATE()
+					AND sh.parked >= vCurDate
 				GROUP BY ish.itemFk
 		),
 		sales AS (
@@ -127,8 +128,8 @@ BEGIN
 					JOIN vn.itemShelving is2 ON is2.id = iss.itemShelvingFk
 					JOIN vn.shelving s2 ON s2.id = is2.shelvingFk
 					JOIN tBuy t ON t.itemFk = s.itemFk
-				WHERE t.shipped BETWEEN util.VN_CURDATE() AND util.dayend(util.VN_CURDATE())
-					AND s2.parked >= util.VN_CURDATE()
+				WHERE t.shipped BETWEEN vCurDate AND util.dayend(vCurDate)
+					AND s2.parked >= vCurDate
 				GROUP BY s.itemFk
 		)
 		SELECT tmp.itemFk,
@@ -152,6 +153,6 @@ BEGIN
 	CALL util.tx_commit(vIsRequiredTx);
 
 	CALL cache.visible_refresh(@c,TRUE,vWarehouseFk);
-	CALL cache.available_refresh(@c, TRUE, vWarehouseFk, util.VN_CURDATE());
+	CALL cache.available_refresh(@c, TRUE, vWarehouseFk, vCurDate);
 END$$
 DELIMITER ;

From 2ee5ba908a518e957312bd5b3c0044f25ef8d38c Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Fri, 24 Jan 2025 13:16:36 +0100
Subject: [PATCH 30/31] feat: refs #6822 change request

---
 modules/entry/back/methods/entry/transfer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/entry/back/methods/entry/transfer.js b/modules/entry/back/methods/entry/transfer.js
index aa4b4c8192..db68736633 100644
--- a/modules/entry/back/methods/entry/transfer.js
+++ b/modules/entry/back/methods/entry/transfer.js
@@ -33,7 +33,7 @@ module.exports = Self => {
 
         try {
             await Self.rawSql('CALL vn.entry_transfer(?, @vNewEntry)', [id], myOptions);
-            const newEntryFk = await Self.rawSql('SELECT @vNewEntry newEntryFk', null, myOptions);
+            const [newEntryFk] = await Self.rawSql('SELECT @vNewEntry newEntryFk', null, myOptions);
 
             if (tx) await tx.commit();
             return newEntryFk;

From 163302c770ca66b7d4838406f93f976c116bec6a Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Fri, 24 Jan 2025 13:26:36 +0100
Subject: [PATCH 31/31] feat: refs #6822 fix test

---
 modules/entry/back/methods/entry/specs/transfer.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/entry/back/methods/entry/specs/transfer.spec.js b/modules/entry/back/methods/entry/specs/transfer.spec.js
index cc712b9949..bf0b2b974a 100644
--- a/modules/entry/back/methods/entry/specs/transfer.spec.js
+++ b/modules/entry/back/methods/entry/specs/transfer.spec.js
@@ -15,7 +15,7 @@ describe('Transfer merchandise from one entry to the next day()', () => {
             const currentItemShelving = await models.ItemShelving.findOne({where: {id}}, options);
             await currentItemShelving.updateAttributes({itemFk: item, buyFk: buy}, options);
 
-            const [{newEntryFk}] = await models.Entry.transfer(ctx, originalEntry, options);
+            const {newEntryFk} = await models.Entry.transfer(ctx, originalEntry, options);
             const originalEntrybuys = await models.Buy.find({where: {entryFk: originalEntry}}, options);
 
             const newEntrybuys = await models.Buy.find({where: {entryFk: newEntryFk}}, options);