From fefc193ec0f4e3207574aa2f5a00c03772a48472 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Tue, 27 Feb 2024 13:59:21 +0100
Subject: [PATCH 01/15] refactor: refs #6496 Deleted clean vn2008

---
 db/routines/cache/procedures/clean.sql        |   2 +-
 db/routines/vn/procedures/clean.sql           | 233 ++++++++++--------
 db/routines/vn2008/procedures/clean.sql       |  79 ------
 .../vn2008/procedures/clean_launcher.sql      |   6 -
 .../10915-limeMastic/00-firstScript.sql       |   2 +
 5 files changed, 131 insertions(+), 191 deletions(-)
 delete mode 100644 db/routines/vn2008/procedures/clean.sql
 delete mode 100644 db/routines/vn2008/procedures/clean_launcher.sql
 create mode 100644 db/versions/10915-limeMastic/00-firstScript.sql

diff --git a/db/routines/cache/procedures/clean.sql b/db/routines/cache/procedures/clean.sql
index 95841a713..ee64d052e 100644
--- a/db/routines/cache/procedures/clean.sql
+++ b/db/routines/cache/procedures/clean.sql
@@ -3,7 +3,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`clean`()
 BEGIN
 	DECLARE vDateShort DATETIME;
 
-	SET vDateShort = TIMESTAMPADD(MONTH, -1, util.VN_CURDATE());
+	SET vDateShort = util.VN_CURDATE() - INTERVAL 1 MONTH;
 
 	DELETE FROM cache.departure_limit WHERE Fecha < vDateShort;
 END$$
diff --git a/db/routines/vn/procedures/clean.sql b/db/routines/vn/procedures/clean.sql
index 06f36afce..c1cafc0fe 100644
--- a/db/routines/vn/procedures/clean.sql
+++ b/db/routines/vn/procedures/clean.sql
@@ -1,48 +1,42 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`clean`()
 BEGIN
-	DECLARE vDateShort DATETIME;
-	DECLARE vOneYearAgo DATE;
-	DECLARE vFourYearsAgo DATE;
-	DECLARE vFiveYearsAgo DATE;
-	DECLARE v18Month DATE;
-	DECLARE v26Month DATE;
-	DECLARE v3Month DATE;
+/**
+ * Purges outdated data to optimize performance.
+ * Exercise caution when executing.
+ */
+	DECLARE v2Months DATE DEFAULT util.VN_CURDATE() - INTERVAL 2 MONTH;
+	DECLARE v3Months DATE DEFAULT util.VN_CURDATE() - INTERVAL 3 MONTH;
+	DECLARE v18Months DATE DEFAULT util.VN_CURDATE() - INTERVAL 18 MONTH;
+	DECLARE v26Months DATE DEFAULT util.VN_CURDATE() - INTERVAL 26 MONTH;
+	DECLARE v1Years DATE DEFAULT util.VN_CURDATE() - INTERVAL 1 YEAR;
+	DECLARE v2Years DATE DEFAULT util.VN_CURDATE() - INTERVAL 2 YEAR;
+	DECLARE v4Years DATE DEFAULT util.VN_CURDATE() - INTERVAL 4 YEAR;
+	DECLARE v5Years DATE DEFAULT util.VN_CURDATE() - INTERVAL 5 YEAR;	
 	DECLARE vTrashId VARCHAR(15);
-	DECLARE v2Years DATE;
-	DECLARE v5Years DATE;
-
-	SET vDateShort = util.VN_CURDATE() - INTERVAL 2 MONTH;
-	SET vOneYearAgo = util.VN_CURDATE() - INTERVAL 1 YEAR;
-	SET vFourYearsAgo = util.VN_CURDATE() - INTERVAL 4 YEAR;
-	SET vFiveYearsAgo = util.VN_CURDATE() - INTERVAL 5 YEAR;
-	SET v18Month = util.VN_CURDATE() - INTERVAL 18 MONTH;
-	SET v26Month = util.VN_CURDATE() - INTERVAL 26 MONTH;
-	SET v3Month = util.VN_CURDATE() - INTERVAL 3 MONTH;
-	SET v2Years = util.VN_CURDATE() - INTERVAL 2 YEAR;
-	SET v5Years = util.VN_CURDATE() - INTERVAL 5 YEAR;
+	DECLARE vCompanyBlk INT;
 
 	DELETE FROM workerActivity WHERE created < v2Years;
-	DELETE FROM ticketParking WHERE created < vDateShort;
-	DELETE FROM routesMonitor WHERE dated < vDateShort;
-	DELETE FROM workerTimeControlLog WHERE created < vDateShort;
-	DELETE FROM `message` WHERE sendDate < vDateShort;
-	DELETE FROM messageInbox WHERE sendDate < vDateShort;
-	DELETE FROM messageInbox WHERE sendDate < vDateShort;
-	DELETE FROM workerTimeControl WHERE timed < vFourYearsAgo;
+	DELETE FROM ticketParking WHERE created < v2Months;
+	DELETE FROM routesMonitor WHERE dated < v2Months;
+	DELETE FROM workerTimeControlLog WHERE created < v2Months;
+	DELETE FROM `message` WHERE sendDate < v2Months;
+	DELETE FROM messageInbox WHERE sendDate < v2Months;
+	DELETE FROM messageInbox WHERE sendDate < v2Months;
+	DELETE FROM workerTimeControl WHERE timed < v4Years;
 	DELETE FROM itemShelving WHERE created < util.VN_CURDATE() AND visible = 0;
-	DELETE FROM ticketDown WHERE created < TIMESTAMPADD(DAY,-1,util.VN_CURDATE());
-	DELETE FROM entryLog WHERE creationDate < vDateShort;
-	DELETE IGNORE FROM expedition WHERE created < v26Month;
-	DELETE FROM sms WHERE created < v18Month;
-	DELETE FROM saleTracking WHERE created < vOneYearAgo;
-	DELETE FROM ticketTracking WHERE created < v18Month;
+	DELETE FROM ticketDown WHERE created < util.yesterday();
+	DELETE FROM entryLog WHERE creationDate < v2Months;
+	DELETE IGNORE FROM expedition WHERE created < v26Months;
+	DELETE FROM sms WHERE created < v18Months;
+	DELETE FROM saleTracking WHERE created < v1Years;
+	DELETE FROM ticketTracking WHERE created < v18Months;
 	DELETE tobs FROM ticketObservation tobs 
 		JOIN ticket t ON tobs.ticketFk = t.id
 		WHERE t.shipped < v5Years;
-	DELETE sc.* FROM saleCloned sc JOIN sale s ON s.id = sc.saleClonedFk JOIN ticket t ON t.id = s.ticketFk WHERE t.shipped < vOneYearAgo;
-	DELETE FROM sharingCart where ended < vDateShort;
-	DELETE FROM sharingClient where ended < vDateShort;
+	DELETE sc.* FROM saleCloned sc JOIN sale s ON s.id = sc.saleClonedFk JOIN ticket t ON t.id = s.ticketFk WHERE t.shipped < v1Years;
+	DELETE FROM sharingCart where ended < v2Months;
+	DELETE FROM sharingClient where ended < v2Months;
 	DELETE tw.* FROM ticketWeekly tw
 			LEFT JOIN sale s ON s.ticketFk = tw.ticketFk
 			LEFT JOIN ticketRequest tr ON tr.ticketFk = tw.ticketFk
@@ -50,73 +44,73 @@ BEGIN
 		WHERE s.id IS NULL
 			AND tr.id IS NULL
 			AND ts.id IS NULL;
-	DELETE FROM claim WHERE ticketCreated < vFourYearsAgo;
-	DELETE FROM message WHERE sendDate < vDateShort;
-	-- Robert ubicacion anterior de trevelLog comentario para debug
-	DELETE FROM zoneEvent WHERE `type` = 'day' AND dated < v3Month;
+	DELETE FROM claim WHERE ticketCreated < v4Years;
+	-- Robert ubicacion anterior de travelLog comentario para debug
+	DELETE FROM zoneEvent WHERE `type` = 'day' AND dated < v3Months;
 	DELETE bm
 		FROM buyMark bm
 			JOIN buy b ON b.id = bm.id
 			JOIN entry e ON e.id = b.entryFk
 			JOIN travel t ON t.id = e.travelFk
-		WHERE t.landed <= vDateShort;
-	DELETE b FROM vn.buy b
-			JOIN vn.entryConfig e ON e.defaultEntry = b.entryFk
-		WHERE b.created < vDateShort;
-	DELETE FROM vn.itemShelvingLog WHERE created < vDateShort;
-	DELETE FROM vn.stockBuyed WHERE creationDate < vDateShort;
-	DELETE FROM vn.itemCleanLog WHERE created < util.VN_NOW() - INTERVAL 1 YEAR;
-	DELETE FROM printQueue WHERE statusCode = 'printed' AND created < vDateShort;
-	DELETE FROM ticketLog WHERE creationDate <= vFiveYearsAgo;
+		WHERE t.landed <= v2Months;
+	DELETE b FROM buy b
+			JOIN entryConfig e ON e.defaultEntry = b.entryFk
+		WHERE b.created < v2Months;
+	DELETE FROM itemShelvingLog WHERE created < v2Months;
+	DELETE FROM stockBuyed WHERE creationDate < v2Months;
+	DELETE FROM itemCleanLog WHERE created < util.VN_NOW() - INTERVAL 1 YEAR;
+	DELETE FROM printQueue WHERE statusCode = 'printed' AND created < v2Months;
+	DELETE FROM ticketLog WHERE creationDate <= v5Years;
 	-- Equipos duplicados
 	DELETE w.*
 		FROM workerTeam w
-		JOIN (SELECT id, team, workerFk, COUNT(*) - 1 as duplicated
+		JOIN (
+			SELECT id, team, workerFk, COUNT(*) - 1 duplicated
 				FROM workerTeam
 				GROUP BY team,workerFk
 				HAVING duplicated
-			 ) d ON d.team = w.team AND d.workerFk = w.workerFk AND d.id != w.id;
+		) d ON d.team = w.team
+			AND d.workerFk = w.workerFk
+			AND d.id <> w.id;
 
 	DELETE sc
 		FROM  saleComponent sc
 			JOIN sale s ON s.id=  sc.saleFk
 			JOIN ticket t ON t.id= s.ticketFk
-		WHERE t.shipped < v18Month;
+		WHERE t.shipped < v18Months;
 
 	DELETE c
-		FROM vn.claim c
-			JOIN vn.claimState cs ON cs.id = c.claimStateFk
-		WHERE cs.description = "Anulado" AND
-			c.created < vDateShort;
-	DELETE
-		FROM vn.expeditionTruck
-		WHERE eta < v3Month;
+		FROM claim c
+			JOIN claimState cs ON cs.id = c.claimStateFk
+		WHERE cs.description = "Anulado"
+			AND c.created < v2Months;
 
-	DELETE FROM XDiario WHERE FECHA < v3Month OR FECHA IS NULL;
-	-- borrar travels sin entradas
-	DROP TEMPORARY TABLE IF EXISTS tmp.thermographToDelete;
-	CREATE TEMPORARY TABLE tmp.thermographToDelete
+	DELETE FROM expeditionTruck WHERE eta < v3Months;
+	DELETE FROM XDiario WHERE FECHA < v3Months OR FECHA IS NULL;
+
+	-- Borrar travels sin entradas
+	CREATE OR REPLACE TEMPORARY TABLE tThermographToDelete
 		SELECT th.id,th.dmsFk
-		FROM vn.travel t
-			LEFT JOIN vn.entry e ON e.travelFk = t.id
-			JOIN vn.travelThermograph th ON th.travelFk = t.id
+		FROM travel t
+			LEFT JOIN entry e ON e.travelFk = t.id
+			JOIN travelThermograph th ON th.travelFk = t.id
 		WHERE t.shipped < TIMESTAMPADD(MONTH, -3, util.VN_CURDATE()) AND e.travelFk IS NULL;
 
 	SELECT dt.id INTO vTrashId
-		FROM vn.dmsType dt
+		FROM dmsType dt
 		WHERE dt.code = 'trash';
 
-	UPDATE tmp.thermographToDelete th
-		JOIN vn.dms d ON d.id = th.dmsFk
+	UPDATE tThermographToDelete th
+		JOIN dms d ON d.id = th.dmsFk
 		SET d.dmsTypeFk = vTrashId;
 
 	DELETE th
-		FROM tmp.thermographToDelete tmp
-		JOIN vn.travelThermograph th ON th.id = tmp.id;
+		FROM tThermographToDelete tmp
+		JOIN travelThermograph th ON th.id = tmp.id;
 
 	DELETE t
-		FROM vn.travel t
-		LEFT JOIN vn.entry e ON e.travelFk = t.id
+		FROM travel t
+		LEFT JOIN entry e ON e.travelFk = t.id
 		WHERE t.shipped < TIMESTAMPADD(MONTH, -3, util.VN_CURDATE()) AND e.travelFk IS NULL;
 	
 	UPDATE dms d
@@ -125,69 +119,98 @@ BEGIN
 		WHERE created < TIMESTAMPADD(MONTH, -dt.monthToDelete, util.VN_CURDATE());
 	
 	-- borrar entradas sin compras
-	DROP TEMPORARY TABLE IF EXISTS tmp.entryToDelete;
-	CREATE TEMPORARY TABLE tmp.entryToDelete
+	CREATE OR REPLACE TEMPORARY TABLE tEntryToDelete
 		SELECT e.*
-			FROM vn.entry e
-			LEFT JOIN vn.buy b ON b.entryFk = e.id
-			JOIN vn.entryConfig  ec ON e.id != ec.defaultEntry
+			FROM entry e
+			LEFT JOIN buy b ON b.entryFk = e.id
+			JOIN entryConfig  ec ON e.id <> ec.defaultEntry
 		WHERE e.dated < TIMESTAMPADD(MONTH, -3, util.VN_CURDATE()) AND b.entryFK IS NULL;
 
 	DELETE e
-		FROM vn.entry e
-		JOIN tmp.entryToDelete tmp ON tmp.id = e.id;
+		FROM entry e
+		JOIN tEntryToDelete tmp ON tmp.id = e.id;
 
 	-- borrar de route registros menores a 4 años
-	DROP TEMPORARY TABLE IF EXISTS tmp.routeToDelete;
-	CREATE TEMPORARY TABLE tmp.routeToDelete
+	CREATE OR REPLACE TEMPORARY TABLE tRouteToDelete
 		SELECT *
-		FROM vn.route r
+		FROM route r
 		WHERE created < TIMESTAMPADD(YEAR,-4,util.VN_CURDATE());   
 
-	UPDATE tmp.routeToDelete tmp
-		JOIN vn.dms d ON d.id = tmp.gestdocFk
+	UPDATE tRouteToDelete tmp
+		JOIN dms d ON d.id = tmp.gestdocFk
 		SET d.dmsTypeFk = vTrashId;
 
 	DELETE r
-		FROM tmp.routeToDelete tmp
-		JOIN vn.route r ON  r.id = tmp.id;
+		FROM tRouteToDelete tmp
+		JOIN route r ON  r.id = tmp.id;
 
 	-- borrar registros de dua y awb menores a 2 años
-	DROP TEMPORARY TABLE IF EXISTS tmp.duaToDelete;
-	CREATE TEMPORARY TABLE tmp.duaToDelete
+	CREATE OR REPLACE TEMPORARY TABLE tDuaToDelete
 		SELECT *
-			FROM vn.dua
+			FROM dua
 			WHERE operated < TIMESTAMPADD(YEAR,-2,CURDATE());
 
-	UPDATE  tmp.duaToDelete tm
-		JOIN vn.dms d ON d.id = tm.gestdocFk
+	UPDATE  tDuaToDelete tm
+		JOIN dms d ON d.id = tm.gestdocFk
 		SET d.dmsTypeFk = vTrashId;
 
 	DELETE d
-		FROM tmp.duaToDelete tmp
-		JOIN vn.dua d ON d.id = tmp.id;
+		FROM tDuaToDelete tmp
+		JOIN dua d ON d.id = tmp.id;
 
 	DELETE a
-		FROM vn.awb a
-			LEFT JOIN vn.travel t ON t.awbFk = a.id
+		FROM awb a
+			LEFT JOIN travel t ON t.awbFk = a.id
 		WHERE a.created < v2Years
 			AND t.id IS NULL;
 
 	-- Borra los registros de collection y ticketcollection
-	DELETE FROM vn.collection  WHERE created < vDateShort;
+	DELETE FROM collection  WHERE created < v2Months;
+	DELETE FROM travelLog WHERE creationDate < v3Months;
 
-	DROP TEMPORARY TABLE IF EXISTS tmp.thermographToDelete;
-	DROP TEMPORARY TABLE IF EXISTS tmp.entryToDelete;
-	DROP TEMPORARY TABLE IF EXISTS tmp.duaToDelete;
-
-	DELETE FROM travelLog WHERE creationDate < v3Month;
-
-	CALL shelving_clean;
+	CALL shelving_clean();
 
 	DELETE FROM chat WHERE dated < v5Years;
+	DELETE tt FROM ticketTracking tt
+		JOIN ticket t ON tt.ticketFk = t.id
+		WHERE t.shipped <= v2Months;
 
-	DELETE tt FROM ticketTracking tt JOIN vn.ticket t ON tt.ticketFk = t.id
-		WHERE t.shipped <= vDateShort;
+	-- Clean vn2008
+	DELETE FROM mail WHERE creationDate < v2Months;
+	DELETE FROM split WHERE dated < v18Months;
+	DELETE FROM remittance WHERE dated < v18Months;
+	
+	CREATE OR REPLACE TEMPORARY TABLE tTicketDelete
+		SELECT DISTINCT tl.originFk ticketFk
+			FROM ticketLog tl
+				JOIN (
+					SELECT MAX(tl.id)ids
+						FROM ticket t
+							JOIN ticketLog tl ON tl.originFk = t.id
+						WHERE t.shipped BETWEEN '2000-01-01' AND '2000-12-31' 
+							AND t.isDeleted
+						GROUP BY t.id
+				) sub ON sub.ids = tl.id 
+			WHERE tl.creationDate <= util.VN_CURDATE() - INTERVAL 60 DAY;
+	DELETE t
+		FROM ticket t
+			JOIN tTicketDelete tmp ON tmp.ticketFk = t.id;
 
+	-- Tickets Nulos PAK 11/10/2016
+	SELECT id INTO vCompanyBlk FROM company WHERE code = 'BLK';
+	UPDATE ticket
+		SET companyFk = vCompanyBlk
+		WHERE clientFk = (SELECT id FROM client WHERE name = 'AUTOCONSUMO')
+			AND companyFk <> vCompanyBlk;
+
+	DROP TEMPORARY TABLE tTicketDelete,
+		tThermographToDelete,
+		tEntryToDelete,
+		tDuaToDelete,
+		tRouteToDelete;
+
+	-- Other schemas
+	DELETE FROM hedera.`order` WHERE date_send < v18Months;
+	DELETE FROM pbx.cdr WHERE call_date < v18Months;
 END$$
 DELIMITER ;
diff --git a/db/routines/vn2008/procedures/clean.sql b/db/routines/vn2008/procedures/clean.sql
deleted file mode 100644
index 946157fa0..000000000
--- a/db/routines/vn2008/procedures/clean.sql
+++ /dev/null
@@ -1,79 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`clean`(IN `v_full` TINYINT(1))
-proc: BEGIN
-	DECLARE vDate DATETIME;
-	DECLARE vDate18 DATETIME;
-	DECLARE vDate26 DATETIME;
-	DECLARE vDate8 DATE;
-	DECLARE vDate6 DATE;
-	DECLARE vDate3 DATE;
-	DECLARE vDate2000 DATE;
-	DECLARE vRangeDeleteTicket INT;
-	DECLARE vStrtable VARCHAR(15) DEFAULT NULL;
-
-	SET vDate = util.VN_CURDATE() - INTERVAL 2 MONTH;
-	SET vDate18 = util.VN_CURDATE() - INTERVAL 18 MONTH;
-	SET vDate26 = util.VN_CURDATE() - INTERVAL 26 MONTH;
-	SET vDate3 = util.VN_CURDATE() - INTERVAL 3 MONTH;
-	SET vDate8 = util.VN_CURDATE() - INTERVAL 8 DAY;
-	SET vDate6 = util.VN_CURDATE() - INTERVAL 6 DAY;
-	SET vDate2000 = util.VN_CURDATE() + INTERVAL (2000 - YEAR(util.VN_CURDATE())) YEAR;
-	SET vRangeDeleteTicket = 60;
-
-	DELETE FROM cdr WHERE calldate < vDate18;
-	DELETE FROM mail WHERE DATE_ODBC < vDate;
-	DELETE FROM Movimientos_mark WHERE odbc_date < vDate;
-	DELETE FROM Splits WHERE Fecha < vDate18;
-
-	DELETE tobs
-		FROM movement_label tobs
-			JOIN Movimientos m ON tobs.Id_Movimiento = m.Id_Movimiento
-		JOIN Tickets t ON m.Id_Ticket = t.Id_Ticket WHERE t.Fecha < vDate;
-
-	DELETE FROM Remesas WHERE `Fecha Remesa` < vDate18;
-
-	DELETE tt.*
-		FROM Tickets_turno tt
-			LEFT JOIN Movimientos m USING(Id_Ticket)
-		WHERE m.Id_Article IS NULL;
-
-	DELETE FROM cl_main WHERE Fecha < vDate18;
-	DELETE FROM hedera.`order` WHERE date_send < vDate18;
-	DELETE FROM vn.message WHERE sendDate < vDate;
-
-	DELETE FROM cache.departure_limit WHERE Fecha < util.VN_CURDATE() - INTERVAL 1 MONTH;
-
-	DELETE cm
-		FROM Compres_mark cm
-			JOIN Compres c ON c.Id_Compra = cm.Id_Compra
-			JOIN Entradas e ON e.Id_Entrada = c.Id_Entrada
-			JOIN travel t ON t.id = e.travel_id
-		WHERE t.landing <= vDate;
-
-	IF v_full THEN
-		CREATE OR REPLACE TEMPORARY TABLE tTicketDelete
-			SELECT DISTINCT tl.originFk ticketFk
-				FROM vn.ticketLog tl
-					JOIN (SELECT MAX(tl.id)ids
-						FROM vn.ticket t
-							JOIN vn.ticketLog tl ON tl.originFk = t.id
-						WHERE t.shipped BETWEEN '2000-01-01' AND '2000-12-31' 
-							AND t.isDeleted
-						GROUP BY t.id
-					)sub ON sub.ids = tl.id 
-				WHERE tl.creationDate <= util.VN_CURDATE() - INTERVAL 60 DAY;
-
-		DELETE t
-			FROM vn.ticket t
-				JOIN tTicketDelete tmp ON tmp.ticketFk = t.id;
-
-		DROP TEMPORARY TABLE tTicketDelete;
-	END IF;
-
-	-- Tickets Nulos PAK 11/10/2016
-	UPDATE Tickets
-		SET empresa_id = 965
-		WHERE Id_Cliente = 31
-			AND empresa_id != 965;
-END$$
-DELIMITER ;
diff --git a/db/routines/vn2008/procedures/clean_launcher.sql b/db/routines/vn2008/procedures/clean_launcher.sql
deleted file mode 100644
index 63c23e8cf..000000000
--- a/db/routines/vn2008/procedures/clean_launcher.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`clean_launcher`()
-BEGIN
-	CALL clean(TRUE);
-END$$
-DELIMITER ;
diff --git a/db/versions/10915-limeMastic/00-firstScript.sql b/db/versions/10915-limeMastic/00-firstScript.sql
new file mode 100644
index 000000000..be83a4984
--- /dev/null
+++ b/db/versions/10915-limeMastic/00-firstScript.sql
@@ -0,0 +1,2 @@
+DELETE IGNORE FROM bs.nightTask
+	WHERE `procedure` = 'clean_launcher';

From 80ecd698f8011c506b467f255ab285c8a42ba466 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Wed, 28 Feb 2024 08:23:58 +0100
Subject: [PATCH 02/15] refactor: refs #6499 Migrated procs to vn

---
 .../procedures/balanceNestTree_addChild.sql}  |  33 +++---
 .../procedures/balanceNestTree_delete.sql}    |  35 +++---
 .../vn/procedures/balanceNestTree_move.sql    | 111 ++++++++++++++++++
 db/routines/vn/procedures/pay.sql             |  68 +++++++++++
 db/routines/vn2008/procedures/nest_move.sql   | 108 -----------------
 db/routines/vn2008/procedures/pay.sql         |  67 -----------
 6 files changed, 210 insertions(+), 212 deletions(-)
 rename db/routines/{vn2008/procedures/nest_child_add.sql => vn/procedures/balanceNestTree_addChild.sql} (54%)
 rename db/routines/{vn2008/procedures/nest_delete.sql => vn/procedures/balanceNestTree_delete.sql} (52%)
 create mode 100644 db/routines/vn/procedures/balanceNestTree_move.sql
 create mode 100644 db/routines/vn/procedures/pay.sql
 delete mode 100644 db/routines/vn2008/procedures/nest_move.sql
 delete mode 100644 db/routines/vn2008/procedures/pay.sql

diff --git a/db/routines/vn2008/procedures/nest_child_add.sql b/db/routines/vn/procedures/balanceNestTree_addChild.sql
similarity index 54%
rename from db/routines/vn2008/procedures/nest_child_add.sql
rename to db/routines/vn/procedures/balanceNestTree_addChild.sql
index 5b45a9d07..d16168a59 100644
--- a/db/routines/vn2008/procedures/nest_child_add.sql
+++ b/db/routines/vn/procedures/balanceNestTree_addChild.sql
@@ -1,48 +1,45 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`nest_child_add`(
-	 vTable VARCHAR(45)
-	,vChild VARCHAR(45)
-	,vFatherId INT
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`balanceNestTree_addChild`(
+	vSelfFather INT,
+	vName VARCHAR(45)
 )
 BEGIN
-	DECLARE vMyLeft INT;
+	DECLARE vTable VARCHAR(45) DEFAULT util.quoteIdentifier('balanceNestTree');
+	DECLARE vLeft INT;
 
-	SET vTable = util.quoteIdentifier(vTable);
-
-	DROP TEMPORARY TABLE IF EXISTS aux;
-	CREATE TEMPORARY TABLE aux
-		SELECT 0 as lft;
+	CREATE OR REPLACE TEMPORARY TABLE tAux
+		SELECT 0 lft;
 
 	EXECUTE IMMEDIATE CONCAT(
-		'UPDATE aux 
+		'UPDATE tAux 
 			SET lft = (SELECT lft 
 				FROM ', vTable, 
 				' WHERE id = ?)')
 		USING vFatherId;
 	
-	SELECT lft INTO vMyLeft FROM aux;
-	DROP TEMPORARY TABLE aux;
+	SELECT lft INTO vLeft FROM tAux;
 
 	EXECUTE IMMEDIATE CONCAT(
 		'UPDATE ', vTable, ' 
 			SET rgt = rgt + 2 
 			WHERE rgt > ? 
 			ORDER BY rgt DESC')
-		USING vMyLeft;
+		USING vLeft;
 	
 	EXECUTE IMMEDIATE CONCAT(
 		'UPDATE ', vTable, ' 
 			SET lft = lft + 2
 			WHERE lft > ? 
 			ORDER BY lft DESC')
-		USING vMyLeft;
+		USING vLeft;
 	
 	EXECUTE IMMEDIATE CONCAT(
 		'INSERT INTO ', vTable, ' (name, lft, rgt)
 			VALUES(?, ? + 1, ? + 2)')
 		USING vChild,
-			vMyLeft,
-			vMyLeft;
-	
+			vLeft,
+			vLeft;
+
+	DROP TEMPORARY TABLE tAux;
 END$$
 DELIMITER ;
diff --git a/db/routines/vn2008/procedures/nest_delete.sql b/db/routines/vn/procedures/balanceNestTree_delete.sql
similarity index 52%
rename from db/routines/vn2008/procedures/nest_delete.sql
rename to db/routines/vn/procedures/balanceNestTree_delete.sql
index 84f75294b..d2f37851f 100644
--- a/db/routines/vn2008/procedures/nest_delete.sql
+++ b/db/routines/vn/procedures/balanceNestTree_delete.sql
@@ -1,51 +1,48 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`nest_delete`(
-	 vTable VARCHAR(45)
-    ,vNodeId INT
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`balanceNestTree_delete`(
+    vSelf INT
 )
 BEGIN
-	DECLARE vMyRight INT;
-	DECLARE vMyLeft INT;
-	DECLARE vMyWidth INT;
+	DECLARE vTable VARCHAR(45) DEFAULT util.quoteIdentifier('balanceNestTree');
+	DECLARE vRight INT;
+	DECLARE vLeft INT;
+	DECLARE vWidth INT;
 
-	DROP TEMPORARY TABLE IF EXISTS aux;
-	CREATE TEMPORARY TABLE aux
+	CREATE OR REPLACE TEMPORARY TABLE tAux
 		SELECT 0 rgt, 0 lft, 0 wdt;
-	
-	SET vTable = util.quoteIdentifier(vTable);
 
 	EXECUTE IMMEDIATE CONCAT(
-		'UPDATE aux a 
+		'UPDATE tAux a 
 				JOIN ', vTable, ' t 
 			SET a.rgt = t.rgt, 
 				a.lft = t.lft,
 				a.wdt = t.rgt - t.lft + 1 
 			WHERE t.id = ?')
-		USING vNodeId;
+		USING vSelf;
 
 	SELECT rgt, lft, wdt 
-		INTO vMyRight, vMyLeft, vMyWidth 
-		FROM aux;
-
-	DROP TEMPORARY TABLE aux;
+		INTO vRight, vLeft, vWidth 
+		FROM tAux;
 
 	EXECUTE IMMEDIATE CONCAT(
 		'DELETE FROM ', vTable, 
 			' WHERE lft BETWEEN ? AND ?')
-		USING vMyLeft, vMyRight;
+		USING vLeft, vRight;
 
 	EXECUTE IMMEDIATE CONCAT(
 		'UPDATE ', vTable, 
 			' SET rgt = rgt - ? 
 			WHERE rgt > ? 
 			ORDER BY rgt')
-		USING vMyWidth,vMyRight;
+		USING vWidth,vRight;
 
 	EXECUTE IMMEDIATE CONCAT(
 		'UPDATE ', vTable, 
 			' SET lft = lft - ?
 			WHERE lft > ? 
 			ORDER BY lft')
-		USING vMyWidth, vMyRight;
+		USING vWidth, vRight;
+
+	DROP TEMPORARY TABLE tAux;
 END$$
 DELIMITER ;
diff --git a/db/routines/vn/procedures/balanceNestTree_move.sql b/db/routines/vn/procedures/balanceNestTree_move.sql
new file mode 100644
index 000000000..ea7c734db
--- /dev/null
+++ b/db/routines/vn/procedures/balanceNestTree_move.sql
@@ -0,0 +1,111 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`balanceNestTree_move`(
+	vSelfNode INT,
+	vSelfFather INT
+)
+BEGIN
+	DECLARE vTable VARCHAR(45) DEFAULT util.quoteIdentifier('balanceNestTree');
+	DECLARE vRight INT;
+	DECLARE vLeft INT;
+	DECLARE vWidth INT;
+	DECLARE vFatherRight INT;
+	DECLARE vFatherLeft INT;
+	DECLARE vGap INT;
+
+	CREATE OR REPLACE TEMPORARY TABLE tAux
+		SELECT 0 rgt, 0 lft, 0 wdt, 0 frg, 0 flf;
+
+	-- Averiguamos el ancho de la rama
+	EXECUTE IMMEDIATE CONCAT(
+		'UPDATE tAux a
+				JOIN ', vTable, ' t 
+			SET a.wdt = t.rgt - t.lft + 1
+			WHERE t.id = ?')
+		USING vSelfNode;
+
+	-- Averiguamos la posicion del nuevo padre
+	EXECUTE IMMEDIATE CONCAT(
+		'UPDATE tAux a
+				JOIN ', vTable, ' t 
+			SET a.frg = t.rgt,
+				a.flf = t.lft
+			WHERE t.id = ?')
+		USING vSelfFather;
+
+	SELECT wdt, frg, flf
+		INTO vWidth, vFatherRight, vFatherLeft 
+		FROM tAux;
+
+	-- 1º Incrementamos los valores de todos los nodos a la derecha
+	-- del punto de inserción (vFatherRight) , para hacer sitio
+	EXECUTE IMMEDIATE CONCAT(
+		'UPDATE ', vTable,  
+			'SET rgt = rgt + ?
+			WHERE rgt >= ? 
+			ORDER BY rgt DESC')
+		USING vWidth,
+			vFatherRight;
+
+	EXECUTE IMMEDIATE CONCAT(
+		'UPDATE ', vTable,  
+			'SET lft = lft + ?
+			WHERE lft >= ? 
+			ORDER BY lft DESC')
+		USING vWidth,
+			vFatherRight;
+
+	-- Es preciso recalcular los valores del nodo en el
+	-- caso de que estuviera a la derecha del nuevo padre
+	EXECUTE IMMEDIATE CONCAT(
+		'UPDATE tAux a
+				JOIN ', vTable, ' t 
+			SET a.rgt = t.rgt, 
+				a.lft = t.lft 
+			WHERE t.id = ?')
+		USING vSelfNode;
+
+	SELECT lft, rgt, frg - lft
+		INTO vLeft, vRight, vGap 
+		FROM tAux;
+
+	-- 2º Incrementamos el valor de todos los nodos a
+	-- trasladar hasta alcanzar su nueva posicion
+	EXECUTE IMMEDIATE CONCAT(
+		'UPDATE ', vTable,  
+			'SET lft = lft + ?
+			WHERE lft BETWEEN ? AND ?
+			ORDER BY lft DESC')
+		USING vGap,
+			vLeft,
+			vRight;
+
+	EXECUTE IMMEDIATE CONCAT(
+		'UPDATE ', vTable,  
+			'SET rgt = rgt + ?
+			WHERE rgt BETWEEN ? AND ?
+			ORDER BY rgt DESC')
+		USING vGap,
+			vLeft,
+			vRight;
+
+	-- 3º Restaremos a todos los nodos resultantes, a la derecha
+	-- de la posicion arrancada el ancho de la rama escindida
+	EXECUTE IMMEDIATE CONCAT(
+		'UPDATE ', vTable,  
+			'SET lft = lft - ?
+			WHERE lft > ?
+			ORDER BY lft')
+		USING vWidth,
+			vLeft;
+
+	EXECUTE IMMEDIATE CONCAT(
+		'UPDATE ', vTable,  
+			'SET rgt = rgt - ?
+			WHERE rgt > ?
+			ORDER BY rgt')
+		USING vWidth,
+			vRight;
+
+	DROP TEMPORARY TABLE tAux;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/pay.sql b/db/routines/vn/procedures/pay.sql
new file mode 100644
index 000000000..42b7a6a55
--- /dev/null
+++ b/db/routines/vn/procedures/pay.sql
@@ -0,0 +1,68 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`pay`(
+	vDated DATE,
+	vSupplierFk INT,
+	vAmount DOUBLE,
+	vCurrencyFk INT,
+	vDivisa DOUBLE,
+	vBankFk INT,
+	vPayMethodFk INT,
+	vExpenseFk DOUBLE,
+	vConcept VARCHAR(40),
+	vCompanyFk INT)
+BEGIN
+	INSERT INTO till(
+			concept,
+			serie,
+			`number`,
+			`out`,
+			dated,
+			isAccountable,
+			bankFk,
+			workerFk,
+			companyFk,
+			isConciliate
+	) 
+		SELECT CONCAT('n/pago a ', `name`),
+				'R',
+				vSupplierFk,
+				vAmount, 
+				vDated,
+				1,
+				vBankFk,
+				account.myUser_getId(),
+				vCompanyFk,
+				1
+			FROM supplier
+			WHERE id = vSupplierFk;
+
+	INSERT INTO payment(
+			received,
+			dueDated,
+			supplierFk,
+			amount,
+			currencyFk,
+			divisa,
+			bankFk,
+			payMethodFk,
+			bankingFees,
+			concept,
+			companyFk
+	)
+		VALUES(
+			vDated,
+			vDated,
+			vSupplierFk,
+			vAmount,
+			vCurrencyFk,
+			IF(NOT vDivisa, NULL, vDivisa),
+			vBankFk,
+			vPayMethodFk,
+			vExpenseFk,
+			vConcept,
+			vCompanyFk
+		);
+			
+	SELECT LAST_INSERT_ID() pago_id;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn2008/procedures/nest_move.sql b/db/routines/vn2008/procedures/nest_move.sql
deleted file mode 100644
index 950d46e68..000000000
--- a/db/routines/vn2008/procedures/nest_move.sql
+++ /dev/null
@@ -1,108 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`nest_move`(
-	 vTable VARCHAR(45)
-	,idNODE INT
-	,idFATHER INT
-)
-BEGIN
-	DECLARE myRight INT;
-	DECLARE myLeft INT;
-	DECLARE myWidth INT;
-	DECLARE fatherRight INT;
-	DECLARE fatherLeft INT;
-	DECLARE gap INT;
-    
-	SET vTable = util.quoteIdentifier(vTable);
-
-	DROP TEMPORARY TABLE IF EXISTS aux;
-	CREATE TEMPORARY TABLE aux
-		SELECT 0 as rgt, 0 as lft, 0 as wdt, 0 as frg, 0 as flf;
-
-	-- Averiguamos el ancho de la rama
-	EXECUTE IMMEDIATE CONCAT(
-		'UPDATE aux a
-				JOIN ', vTable, ' t 
-			SET a.wdt = t.rgt - t.lft + 1
-			WHERE t.id = ?')
-		USING idNODE;
-
-	-- Averiguamos la posicion del nuevo padre
-	EXECUTE IMMEDIATE CONCAT(
-		'UPDATE aux a
-				JOIN ', vTable, ' t 
-			SET a.frg = t.rgt,
-				a.flf = t.lft
-			WHERE t.id = ?')
-		USING idFATHER;
-
-	SELECT wdt, frg, flf INTO  myWidth, fatherRight, fatherLeft 
-		FROM aux;
-
-	-- 1º Incrementamos los valores de todos los nodos a la derecha del punto de inserción (fatherRight) , para hacer sitio
-	EXECUTE IMMEDIATE CONCAT(
-		'UPDATE ', vTable,  
-			'SET rgt = rgt + ?
-			WHERE rgt >= ? 
-			ORDER BY rgt DESC')
-		USING myWidth,
-			fatherRight;
-
-	EXECUTE IMMEDIATE CONCAT(
-		'UPDATE ', vTable,  
-			'SET lft = lft + ?
-			WHERE lft >= ? 
-			ORDER BY lft DESC')
-		USING myWidth,
-			fatherRight;
-
-	-- Es preciso recalcular los valores del nodo en el caso de que estuviera a la derecha del nuevo padre
-	EXECUTE IMMEDIATE CONCAT(
-		'UPDATE aux a
-				JOIN ', vTable, ' t 
-			SET a.rgt = t.rgt, 
-				a.lft = t.lft 
-			WHERE t.id = ?')
-		USING idNODE;
-
-	SELECT lft, rgt, frg - lft INTO  myLeft, myRight, gap 
-		FROM aux;
-
-	-- 2º Incrementamos el valor de todos los nodos a trasladar hasta alcanzar su nueva posicion
-	EXECUTE IMMEDIATE CONCAT(
-		'UPDATE ', vTable,  
-			'SET lft = lft + ?
-			WHERE lft BETWEEN ? AND ?
-			ORDER BY lft DESC')
-		USING gap,
-			myLeft,
-			myRight;
-
-	EXECUTE IMMEDIATE CONCAT(
-		'UPDATE ', vTable,  
-			'SET rgt = rgt + ?
-			WHERE rgt BETWEEN ? AND ?
-			ORDER BY rgt DESC')
-		USING gap,
-			myLeft,
-			myRight;
-
-	-- 3º Restaremos a todos los nodos resultantes, a la derecha de la posicion arrancada el ancho de la rama escindida
-	EXECUTE IMMEDIATE CONCAT(
-		'UPDATE ', vTable,  
-			'SET lft = lft - ?
-			WHERE lft > ?
-			ORDER BY lft')
-		USING myWidth,
-			myLeft;
-
-	EXECUTE IMMEDIATE CONCAT(
-		'UPDATE ', vTable,  
-			'SET rgt = rgt - ?
-			WHERE rgt > ?
-			ORDER BY rgt')
-		USING myWidth,
-			myRight;
-
-	DROP TEMPORARY TABLE aux;
-END$$
-DELIMITER ;
diff --git a/db/routines/vn2008/procedures/pay.sql b/db/routines/vn2008/procedures/pay.sql
deleted file mode 100644
index ec73ee696..000000000
--- a/db/routines/vn2008/procedures/pay.sql
+++ /dev/null
@@ -1,67 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`pay`(IN datFEC DATE
-                      , IN idPROV INT
-                      , IN dblIMPORTE DOUBLE
-                      , IN idMONEDA INT 
-                      , IN dblDIVISA DOUBLE
-                      , IN idCAJA INT
-                      , IN idPAYMET INT
-                      , IN dblGASTOS DOUBLE
-                      , IN strCONCEPTO VARCHAR(40)
-                      , IN idEMP INT)
-BEGIN
-   
-	-- Registro en la tabla Cajas
-	INSERT INTO Cajas ( Concepto
-				  , Serie
-                  , Numero
-                  , Salida
-                  , Cajafecha
-                  , Partida
-                  , Id_Banco
-                  , Id_Trabajador
-                  ,empresa_id 
-                  ,conciliado) 
-                  
-	SELECT		      CONCAT('n/pago a ', Proveedor) 
-				 , 'R' 
-                 , idPROV 
-                 , dblIMPORTE 
-                 , datFEC
-                 , 1
-                 , idCAJA
-                 , account.myUser_getId()
-                 , idEMP
-                 , 1
-		FROM Proveedores
-		WHERE Id_Proveedor = idPROV;
-
-	-- Registro en la tabla pago
-	INSERT INTO pago(fecha
-					, dueDated
-					, id_proveedor
-					, importe
-					, id_moneda
-					, divisa
-					, id_banco
-					, pay_met_id
-					, g_bancarios
-					, concepte
-					, empresa_id)
-               
-         VALUES(datFEC
-				, datFEC
-				, idPROV
-				, dblIMPORTE
-				, idMONEDA
-				, IF(dblDIVISA = 0, NULL, dblDIVISA)
-				, idCAJA
-				, idPAYMET
-				, dblGASTOS
-				, strCONCEPTO
-				, idEMP);
-               
-	SELECT LAST_INSERT_ID() as pago_id;
-
-END$$
-DELIMITER ;

From 6c67462943343b21c5cc5292c24762665523325e Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Wed, 28 Feb 2024 08:26:17 +0100
Subject: [PATCH 03/15] refactor: refs #6499 Minor changes

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

diff --git a/db/routines/vn/procedures/balanceNestTree_addChild.sql b/db/routines/vn/procedures/balanceNestTree_addChild.sql
index d16168a59..a4d6dc4b0 100644
--- a/db/routines/vn/procedures/balanceNestTree_addChild.sql
+++ b/db/routines/vn/procedures/balanceNestTree_addChild.sql
@@ -15,7 +15,7 @@ BEGIN
 			SET lft = (SELECT lft 
 				FROM ', vTable, 
 				' WHERE id = ?)')
-		USING vFatherId;
+		USING vSelfFather;
 	
 	SELECT lft INTO vLeft FROM tAux;
 

From b9c5930f68a31f93125229227a44ecdb70b5e379 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Wed, 28 Feb 2024 08:29:12 +0100
Subject: [PATCH 04/15] refactor: refs #6499 Minor changes

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

diff --git a/db/routines/vn/procedures/balanceNestTree_addChild.sql b/db/routines/vn/procedures/balanceNestTree_addChild.sql
index a4d6dc4b0..7433cbb42 100644
--- a/db/routines/vn/procedures/balanceNestTree_addChild.sql
+++ b/db/routines/vn/procedures/balanceNestTree_addChild.sql
@@ -36,7 +36,7 @@ BEGIN
 	EXECUTE IMMEDIATE CONCAT(
 		'INSERT INTO ', vTable, ' (name, lft, rgt)
 			VALUES(?, ? + 1, ? + 2)')
-		USING vChild,
+		USING vName,
 			vLeft,
 			vLeft;
 

From cba0e55846045da31098d94f15d9e2c207a8c403 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Wed, 28 Feb 2024 08:39:49 +0100
Subject: [PATCH 05/15] refactor: refs #6499 Added comments

---
 .../vn/procedures/balanceNestTree_addChild.sql     | 11 +++++++++--
 .../vn/procedures/balanceNestTree_delete.sql       |  5 +++++
 db/routines/vn/procedures/balanceNestTree_move.sql | 12 +++++++++---
 db/routines/vn/procedures/pay.sql                  | 14 ++++++++++++++
 4 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/db/routines/vn/procedures/balanceNestTree_addChild.sql b/db/routines/vn/procedures/balanceNestTree_addChild.sql
index 7433cbb42..0f4f31b06 100644
--- a/db/routines/vn/procedures/balanceNestTree_addChild.sql
+++ b/db/routines/vn/procedures/balanceNestTree_addChild.sql
@@ -1,9 +1,16 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`balanceNestTree_addChild`(
-	vSelfFather INT,
+	vSelf INT,
 	vName VARCHAR(45)
 )
 BEGIN
+/**
+ * Agrega u nuevo nodo hijo a un nodo existente dentro de la estructura
+ * de árbol de vn.balanceNestTree.
+ *
+ * @param vSelf Identificador del nodo
+ * @param vName Nombre del nuevo nodo hijo
+ */
 	DECLARE vTable VARCHAR(45) DEFAULT util.quoteIdentifier('balanceNestTree');
 	DECLARE vLeft INT;
 
@@ -15,7 +22,7 @@ BEGIN
 			SET lft = (SELECT lft 
 				FROM ', vTable, 
 				' WHERE id = ?)')
-		USING vSelfFather;
+		USING vSelf;
 	
 	SELECT lft INTO vLeft FROM tAux;
 
diff --git a/db/routines/vn/procedures/balanceNestTree_delete.sql b/db/routines/vn/procedures/balanceNestTree_delete.sql
index d2f37851f..1d6a9efff 100644
--- a/db/routines/vn/procedures/balanceNestTree_delete.sql
+++ b/db/routines/vn/procedures/balanceNestTree_delete.sql
@@ -3,6 +3,11 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`balanceNestTree_del
     vSelf INT
 )
 BEGIN
+/**
+ * Elimina un nodo dentro de la estructura de árbol de vn.balanceNestTree.
+ *
+ * @param vSelf Identificador del nodo
+ */
 	DECLARE vTable VARCHAR(45) DEFAULT util.quoteIdentifier('balanceNestTree');
 	DECLARE vRight INT;
 	DECLARE vLeft INT;
diff --git a/db/routines/vn/procedures/balanceNestTree_move.sql b/db/routines/vn/procedures/balanceNestTree_move.sql
index ea7c734db..e4f0b9de4 100644
--- a/db/routines/vn/procedures/balanceNestTree_move.sql
+++ b/db/routines/vn/procedures/balanceNestTree_move.sql
@@ -1,9 +1,15 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`balanceNestTree_move`(
-	vSelfNode INT,
+	vSelf INT,
 	vSelfFather INT
 )
 BEGIN
+/**
+ * Mueve un nodo dentro de la estructura de árbol de vn.balanceNestTree.
+ *
+ * @param vSelf Identificador del nodo
+ * @param vSelfFather Identificador del nuevo padre del nodo
+ */
 	DECLARE vTable VARCHAR(45) DEFAULT util.quoteIdentifier('balanceNestTree');
 	DECLARE vRight INT;
 	DECLARE vLeft INT;
@@ -21,7 +27,7 @@ BEGIN
 				JOIN ', vTable, ' t 
 			SET a.wdt = t.rgt - t.lft + 1
 			WHERE t.id = ?')
-		USING vSelfNode;
+		USING vSelf;
 
 	-- Averiguamos la posicion del nuevo padre
 	EXECUTE IMMEDIATE CONCAT(
@@ -62,7 +68,7 @@ BEGIN
 			SET a.rgt = t.rgt, 
 				a.lft = t.lft 
 			WHERE t.id = ?')
-		USING vSelfNode;
+		USING vSelf;
 
 	SELECT lft, rgt, frg - lft
 		INTO vLeft, vRight, vGap 
diff --git a/db/routines/vn/procedures/pay.sql b/db/routines/vn/procedures/pay.sql
index 42b7a6a55..5dc21e45f 100644
--- a/db/routines/vn/procedures/pay.sql
+++ b/db/routines/vn/procedures/pay.sql
@@ -11,6 +11,20 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`pay`(
 	vConcept VARCHAR(40),
 	vCompanyFk INT)
 BEGIN
+/**
+ * Registra un pago realizado a un proveedor.
+ *
+ * @param vDated Fecha del pago
+ * @param vSupplierFk Id del proveedor
+ * @param vAmount Cantidad a pagar
+ * @param vCurrencyFk Id de la moneda
+ * @param vDivisa Tipo de cambio utilizado
+ * @param vBankFk Id del banco
+ * @param vPayMethodFk Id del método de pago
+ * @param vExpenseFk Id de gasto
+ * @param vConcept Concepto del pago
+ * @param vCompanyFk Id de la empresa
+ */
 	INSERT INTO till(
 			concept,
 			serie,

From b8e6cc9f9ce3e6221aba1385046db019daf0bb47 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Wed, 28 Feb 2024 09:08:47 +0100
Subject: [PATCH 06/15] refactor: refs #6499 Added comments

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

diff --git a/db/routines/vn/procedures/balanceNestTree_addChild.sql b/db/routines/vn/procedures/balanceNestTree_addChild.sql
index 0f4f31b06..5cd1ab470 100644
--- a/db/routines/vn/procedures/balanceNestTree_addChild.sql
+++ b/db/routines/vn/procedures/balanceNestTree_addChild.sql
@@ -5,7 +5,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`balanceNestTree_add
 )
 BEGIN
 /**
- * Agrega u nuevo nodo hijo a un nodo existente dentro de la estructura
+ * Agrega un nuevo nodo hijo a un nodo existente dentro de la estructura
  * de árbol de vn.balanceNestTree.
  *
  * @param vSelf Identificador del nodo

From 9f2d1a8c0f523db3b7ec33ad90dd1d883136e8dd Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Wed, 28 Feb 2024 09:13:01 +0100
Subject: [PATCH 07/15] refactor: refs #6499 Minor change

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

diff --git a/db/routines/vn/procedures/pay.sql b/db/routines/vn/procedures/pay.sql
index 5dc21e45f..c868bfb53 100644
--- a/db/routines/vn/procedures/pay.sql
+++ b/db/routines/vn/procedures/pay.sql
@@ -24,6 +24,7 @@ BEGIN
  * @param vExpenseFk Id de gasto
  * @param vConcept Concepto del pago
  * @param vCompanyFk Id de la empresa
+ * @return paymentFk Id de pago insertado
  */
 	INSERT INTO till(
 			concept,
@@ -77,6 +78,6 @@ BEGIN
 			vCompanyFk
 		);
 			
-	SELECT LAST_INSERT_ID() pago_id;
+	SELECT LAST_INSERT_ID() paymentFk;
 END$$
 DELIMITER ;

From 7a43ccaa3685d11afcedcb68569eaa75b5b6ca3c Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Thu, 29 Feb 2024 07:32:19 +0100
Subject: [PATCH 08/15] refactor: refs #6496 Requested changes

---
 db/routines/cache/procedures/clean.sql |  6 +---
 db/routines/vn/procedures/clean.sql    | 45 +++++++++++++-------------
 2 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/db/routines/cache/procedures/clean.sql b/db/routines/cache/procedures/clean.sql
index ee64d052e..5e6628689 100644
--- a/db/routines/cache/procedures/clean.sql
+++ b/db/routines/cache/procedures/clean.sql
@@ -1,10 +1,6 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `cache`.`clean`()
 BEGIN
-	DECLARE vDateShort DATETIME;
-
-	SET vDateShort = util.VN_CURDATE() - INTERVAL 1 MONTH;
-
-	DELETE FROM cache.departure_limit WHERE Fecha < vDateShort;
+	DELETE FROM cache.departure_limit WHERE Fecha < util.VN_CURDATE() - INTERVAL 1 MONTH;
 END$$
 DELIMITER ;
diff --git a/db/routines/vn/procedures/clean.sql b/db/routines/vn/procedures/clean.sql
index c1cafc0fe..898a5c835 100644
--- a/db/routines/vn/procedures/clean.sql
+++ b/db/routines/vn/procedures/clean.sql
@@ -82,7 +82,7 @@ BEGIN
 	DELETE c
 		FROM claim c
 			JOIN claimState cs ON cs.id = c.claimStateFk
-		WHERE cs.description = "Anulado"
+		WHERE cs.description = 'Anulado'
 			AND c.created < v2Months;
 
 	DELETE FROM expeditionTruck WHERE eta < v3Months;
@@ -94,69 +94,71 @@ BEGIN
 		FROM travel t
 			LEFT JOIN entry e ON e.travelFk = t.id
 			JOIN travelThermograph th ON th.travelFk = t.id
-		WHERE t.shipped < TIMESTAMPADD(MONTH, -3, util.VN_CURDATE()) AND e.travelFk IS NULL;
+		WHERE t.shipped < v3Months
+			AND e.travelFk IS NULL;
 
 	SELECT dt.id INTO vTrashId
 		FROM dmsType dt
 		WHERE dt.code = 'trash';
 
 	UPDATE tThermographToDelete th
-		JOIN dms d ON d.id = th.dmsFk
+			JOIN dms d ON d.id = th.dmsFk
 		SET d.dmsTypeFk = vTrashId;
 
 	DELETE th
 		FROM tThermographToDelete tmp
-		JOIN travelThermograph th ON th.id = tmp.id;
+			JOIN travelThermograph th ON th.id = tmp.id;
 
 	DELETE t
 		FROM travel t
-		LEFT JOIN entry e ON e.travelFk = t.id
-		WHERE t.shipped < TIMESTAMPADD(MONTH, -3, util.VN_CURDATE()) AND e.travelFk IS NULL;
+			LEFT JOIN entry e ON e.travelFk = t.id
+		WHERE t.shipped < v3Months AND e.travelFk IS NULL;
 	
 	UPDATE dms d
 			JOIN dmsType dt ON dt.id = d.dmsTypeFk 
 		SET d.dmsTypeFk = vTrashId 
-		WHERE created < TIMESTAMPADD(MONTH, -dt.monthToDelete, util.VN_CURDATE());
+		WHERE created < util.VN_CURDATE() - INTERVAL dt.monthToDelete MONTH;
 	
 	-- borrar entradas sin compras
 	CREATE OR REPLACE TEMPORARY TABLE tEntryToDelete
 		SELECT e.*
 			FROM entry e
-			LEFT JOIN buy b ON b.entryFk = e.id
-			JOIN entryConfig  ec ON e.id <> ec.defaultEntry
-		WHERE e.dated < TIMESTAMPADD(MONTH, -3, util.VN_CURDATE()) AND b.entryFK IS NULL;
+				LEFT JOIN buy b ON b.entryFk = e.id
+				JOIN entryConfig  ec ON e.id <> ec.defaultEntry
+			WHERE e.dated < v3Months
+				AND b.entryFK IS NULL;
 
 	DELETE e
 		FROM entry e
-		JOIN tEntryToDelete tmp ON tmp.id = e.id;
+			JOIN tEntryToDelete tmp ON tmp.id = e.id;
 
 	-- borrar de route registros menores a 4 años
 	CREATE OR REPLACE TEMPORARY TABLE tRouteToDelete
 		SELECT *
-		FROM route r
-		WHERE created < TIMESTAMPADD(YEAR,-4,util.VN_CURDATE());   
+			FROM route r
+			WHERE created < v4Years;   
 
 	UPDATE tRouteToDelete tmp
-		JOIN dms d ON d.id = tmp.gestdocFk
+			JOIN dms d ON d.id = tmp.gestdocFk
 		SET d.dmsTypeFk = vTrashId;
 
 	DELETE r
 		FROM tRouteToDelete tmp
-		JOIN route r ON  r.id = tmp.id;
+			JOIN route r ON  r.id = tmp.id;
 
 	-- borrar registros de dua y awb menores a 2 años
 	CREATE OR REPLACE TEMPORARY TABLE tDuaToDelete
 		SELECT *
 			FROM dua
-			WHERE operated < TIMESTAMPADD(YEAR,-2,CURDATE());
+			WHERE operated < v2Years;
 
-	UPDATE  tDuaToDelete tm
-		JOIN dms d ON d.id = tm.gestdocFk
+	UPDATE tDuaToDelete tm
+			JOIN dms d ON d.id = tm.gestdocFk
 		SET d.dmsTypeFk = vTrashId;
 
 	DELETE d
 		FROM tDuaToDelete tmp
-		JOIN dua d ON d.id = tmp.id;
+			JOIN dua d ON d.id = tmp.id;
 
 	DELETE a
 		FROM awb a
@@ -165,17 +167,16 @@ BEGIN
 			AND t.id IS NULL;
 
 	-- Borra los registros de collection y ticketcollection
-	DELETE FROM collection  WHERE created < v2Months;
+	DELETE FROM collection WHERE created < v2Months;
 	DELETE FROM travelLog WHERE creationDate < v3Months;
 
 	CALL shelving_clean();
 
 	DELETE FROM chat WHERE dated < v5Years;
 	DELETE tt FROM ticketTracking tt
-		JOIN ticket t ON tt.ticketFk = t.id
+			JOIN ticket t ON tt.ticketFk = t.id
 		WHERE t.shipped <= v2Months;
 
-	-- Clean vn2008
 	DELETE FROM mail WHERE creationDate < v2Months;
 	DELETE FROM split WHERE dated < v18Months;
 	DELETE FROM remittance WHERE dated < v18Months;

From 96bab9b27d039a04b246f01dc1439642f39b8a02 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Thu, 29 Feb 2024 07:37:23 +0100
Subject: [PATCH 09/15] refactor: refs #6496 Requested changes

---
 db/routines/vn/procedures/balanceNestTree_move.sql | 6 +++---
 db/routines/vn/procedures/pay.sql                  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/db/routines/vn/procedures/balanceNestTree_move.sql b/db/routines/vn/procedures/balanceNestTree_move.sql
index e4f0b9de4..ce29de1d9 100644
--- a/db/routines/vn/procedures/balanceNestTree_move.sql
+++ b/db/routines/vn/procedures/balanceNestTree_move.sql
@@ -1,14 +1,14 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`balanceNestTree_move`(
 	vSelf INT,
-	vSelfFather INT
+	vFather INT
 )
 BEGIN
 /**
  * Mueve un nodo dentro de la estructura de árbol de vn.balanceNestTree.
  *
  * @param vSelf Identificador del nodo
- * @param vSelfFather Identificador del nuevo padre del nodo
+ * @param vFather Identificador del nuevo padre del nodo
  */
 	DECLARE vTable VARCHAR(45) DEFAULT util.quoteIdentifier('balanceNestTree');
 	DECLARE vRight INT;
@@ -36,7 +36,7 @@ BEGIN
 			SET a.frg = t.rgt,
 				a.flf = t.lft
 			WHERE t.id = ?')
-		USING vSelfFather;
+		USING vFather;
 
 	SELECT wdt, frg, flf
 		INTO vWidth, vFatherRight, vFatherLeft 
diff --git a/db/routines/vn/procedures/pay.sql b/db/routines/vn/procedures/pay.sql
index c868bfb53..2ef9ca2d6 100644
--- a/db/routines/vn/procedures/pay.sql
+++ b/db/routines/vn/procedures/pay.sql
@@ -4,7 +4,7 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`pay`(
 	vSupplierFk INT,
 	vAmount DOUBLE,
 	vCurrencyFk INT,
-	vDivisa DOUBLE,
+	vForeignValue DOUBLE,
 	vBankFk INT,
 	vPayMethodFk INT,
 	vExpenseFk DOUBLE,
@@ -18,7 +18,7 @@ BEGIN
  * @param vSupplierFk Id del proveedor
  * @param vAmount Cantidad a pagar
  * @param vCurrencyFk Id de la moneda
- * @param vDivisa Tipo de cambio utilizado
+ * @param vForeignValue Tipo de cambio utilizado
  * @param vBankFk Id del banco
  * @param vPayMethodFk Id del método de pago
  * @param vExpenseFk Id de gasto
@@ -70,7 +70,7 @@ BEGIN
 			vSupplierFk,
 			vAmount,
 			vCurrencyFk,
-			IF(NOT vDivisa, NULL, vDivisa),
+			IF(NOT vForeignValue, NULL, vForeignValue),
 			vBankFk,
 			vPayMethodFk,
 			vExpenseFk,

From f4aa5cea915eefc0b8872a41f16a72a660176f31 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Fri, 1 Mar 2024 07:32:45 +0100
Subject: [PATCH 10/15] refactor: refs #6499 Grants

---
 db/versions/10924-pinkCordyline/00-firstScript.sql | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 db/versions/10924-pinkCordyline/00-firstScript.sql

diff --git a/db/versions/10924-pinkCordyline/00-firstScript.sql b/db/versions/10924-pinkCordyline/00-firstScript.sql
new file mode 100644
index 000000000..ea04623cd
--- /dev/null
+++ b/db/versions/10924-pinkCordyline/00-firstScript.sql
@@ -0,0 +1,4 @@
+GRANT EXECUTE ON PROCEDURE vn.balanceNestTree_addChild TO adminBoss;
+GRANT EXECUTE ON PROCEDURE vn.balanceNestTree_delete TO adminBoss;
+GRANT EXECUTE ON PROCEDURE vn.balanceNestTree_move TO adminBoss;
+GRANT EXECUTE ON PROCEDURE vn.pay TO financial;

From 1f9f10323b9b738bb2238412381b25a8b042aeb9 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Fri, 1 Mar 2024 11:21:04 +0100
Subject: [PATCH 11/15] refactor: refs #6494 Migrated and deleted residual
 procs

---
 .../procedures/confection_controlSource.sql   | 112 ++++++++++++++++++
 db/routines/vn/procedures/remittance_calc.sql |  70 +++++++++++
 .../vn2008/procedures/CalculoRemesas.sql      |  66 -----------
 db/routines/vn2008/procedures/cacheReset.sql  |  11 --
 db/routines/vn2008/procedures/camiones.sql    |  23 ----
 db/routines/vn2008/procedures/cobro.sql       |  79 ------------
 .../procedures/confection_control_source.sql  | 105 ----------------
 .../10925-orangeLaurel/00-firstScript.sql     |  15 +++
 8 files changed, 197 insertions(+), 284 deletions(-)
 create mode 100644 db/routines/vn/procedures/confection_controlSource.sql
 create mode 100644 db/routines/vn/procedures/remittance_calc.sql
 delete mode 100644 db/routines/vn2008/procedures/CalculoRemesas.sql
 delete mode 100644 db/routines/vn2008/procedures/cacheReset.sql
 delete mode 100644 db/routines/vn2008/procedures/camiones.sql
 delete mode 100644 db/routines/vn2008/procedures/cobro.sql
 delete mode 100644 db/routines/vn2008/procedures/confection_control_source.sql
 create mode 100644 db/versions/10925-orangeLaurel/00-firstScript.sql

diff --git a/db/routines/vn/procedures/confection_controlSource.sql b/db/routines/vn/procedures/confection_controlSource.sql
new file mode 100644
index 000000000..6cd43036f
--- /dev/null
+++ b/db/routines/vn/procedures/confection_controlSource.sql
@@ -0,0 +1,112 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`confection_controlSource`(
+	vDated DATE,
+	vScopeDays INT,
+	vMaxAlertLevel INT,
+	vWarehouseFk INT
+)
+BEGIN
+/**
+ * Obtiene la información para el control de confección,
+ * ya sean tickets y/o entradas.
+ *
+ * @param vDated Fecha a calcular
+ * @param vScopeDays Número de días desde hoy en adelante que entran en el cálculo.
+ * @param vMaxAlertLevel Id nivel de alerta
+ * @param vWarehouseFk Id de almacén
+ */
+	DECLARE vMidnight DATETIME DEFAULT util.dayEnd(vDated);
+	DECLARE vEndingDate DATETIME DEFAULT vMidnight + INTERVAL vScopeDays DAY;
+
+	CREATE OR REPLACE TEMPORARY TABLE tConfectionControlSource
+		ENGINE = MEMORY
+		SELECT t.shipped,
+			t.id ticketFk,
+			s.id saleFk,
+			s.quantity,
+			s.concept,
+			ABS(s.reserved) isReserved,
+			i.category,
+			it.name itemType,
+			t.nickname,
+			wh.name warehouse,
+			t.warehouseFk warehouseFk,
+			a.provinceFk,
+			am.agencyFk,
+			ct.description,
+			stock.visible,
+			stock.available
+		FROM ticket t
+			JOIN agencyMode am ON am.id = t.agencyModeFk
+			JOIN warehouse wh ON wh.id = t.warehouseFk
+			JOIN sale s ON s.ticketFk = t.id
+			JOIN item i ON i.id = s.itemFk
+			JOIN itemType it ON it.id = i.typeFk
+			JOIN confectionType ct ON ct.id = it.making
+			JOIN `address` a on a.id = t.addressFk
+			LEFT JOIN ticketState tls on tls.ticketFk = t.id
+			LEFT JOIN
+				(
+					SELECT item_id,
+							SUM(visible) visible,
+							SUM(available) available
+					FROM (
+						SELECT a.item_id,
+								0 visible,
+								a.available
+						FROM cache.cache_calc cc
+							LEFT JOIN cache.available a ON a.calc_id = cc.id
+						WHERE cc.cache_id IN ('visible', 'available')
+							AND cc.params = CONCAT(vWarehouseFk, "/", util.VN_CURDATE())
+						UNION ALL
+						SELECT v.item_id,
+								v.visible,
+								0
+							FROM cache.cache_calc cc
+								LEFT JOIN cache.visible v ON v.calc_id = cc.id
+							WHERE cc.cacheName IN ('visible', 'available')
+								AND cc.params = vWarehouseFk
+					) sub
+					GROUP BY item_id
+				) stock ON stock.item_id = s.itemFk
+		WHERE it.making 
+			AND tls.alertLevel < vMaxAlertLevel
+			AND wh.hasConfectionTeam
+			AND t.shipped BETWEEN vDated AND vEndingDate
+			AND s.quantity > 0;
+
+	-- Entradas
+	INSERT INTO tConfectionControlSource(
+			shipped,
+			ticketFk,
+			quantity,
+			concept,
+			category,
+			nickname,
+			warehouse,
+			description
+		)
+		SELECT tr.shipped, 
+				e.id,
+				b.quantity,
+				i.name,
+				i.category,
+				whi.name,
+				who.name,
+				ct.description
+			FROM buy b
+				JOIN `entry` e ON e.id = b.entryFk
+				JOIN travel tr ON tr.id = e.travelFk
+				JOIN warehouse whi ON whi.id = tr.warehouseInFk
+				JOIN warehouse who ON who.id = tr.warehouseOutFk
+				JOIN item i ON i.id = b.itemFk
+				JOIN itemType it ON it.id = i.typeFk
+				JOIN confectionType ct ON ct.id = it.making
+			WHERE who.hasConfectionTeam
+				AND it.making
+				AND tr.shipped BETWEEN vDated AND vEndingDate;
+
+	SELECT * FROM tConfectionControlSource;
+	DROP TEMPORARY TABLE tConfectionControlSource;
+END$$
+DELIMITER ;
diff --git a/db/routines/vn/procedures/remittance_calc.sql b/db/routines/vn/procedures/remittance_calc.sql
new file mode 100644
index 000000000..ed0a18662
--- /dev/null
+++ b/db/routines/vn/procedures/remittance_calc.sql
@@ -0,0 +1,70 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`remittance_calc`(
+	vDated DATE
+)
+BEGIN
+/**
+* Calcula los datos de remesa, incluyendo el importe,
+* el vencimiento, y otros datos relevantes.
+*
+* @param vDated Fecha a calcular
+* @return tmp.remittance
+*/
+	CREATE OR REPLACE TEMPORARY TABLE tmp.remittance
+		SELECT CONCAT(s.nif, REPEAT('0', 12 - LENGTH(s.nif))) cif,
+				c.id clientFk,
+				c.name client,
+				c.fi,
+				sub.paymentDate,
+				0 invoiceAmount,
+				CAST(sub.receipt AS DECIMAL(10,2)) receiptAmount,
+				0 currentAmount,
+				sub.companyFk,
+				c.socialName,
+				CAST(sub.receipt AS DECIMAL(10,2)) totalAmount,
+				CAST(sub.receipt AS DECIMAL(10,2)) balance,
+				s.name company,
+				co.code companyCode,
+				c.accountingAccount,
+				c.iban,
+				c.hasSepaVnl,
+				c.hasCoreVnl,
+				c.hasLcr,
+				be.bic,
+				be.`name` entityName
+			FROM client c
+				JOIN (
+					SELECT risk.companyFk,
+							c.id,
+							SUM(risk.amount) receipt,
+							IF((c.dueDay + graceDays) MOD 30.001 <= DAY(vDated),
+								LAST_DAY(vDated - INTERVAL 1 MONTH) + INTERVAL (c.dueDay + graceDays) MOD 30.001 DAY,
+								LAST_DAY(vDated - INTERVAL 2 MONTH) + INTERVAL (c.dueDay + graceDays) MOD 30.001 DAY
+							) paymentDate												
+						FROM client c
+							JOIN payMethod pm ON pm.id = c.payMethodFk
+							JOIN (
+									SELECT cr.companyFk, cr.clientFk, cr.amount
+										FROM client c
+											JOIN clientRisk cr ON cr.clientFk = c.id
+											JOIN payMethod pm ON pm.id = c.payMethodFk
+										WHERE pm.code = 'bankDraft'
+									UNION ALL
+									SELECT io.companyFk, io.clientFk, - io.amount
+										FROM invoiceOut io 
+											JOIN client c ON c.id = io.clientFk
+											JOIN payMethod pm ON pm.id = c.payMethodFk
+										WHERE io.dued > vDated
+											AND pm.code = 'bankDraft'
+											AND pm.outstandingDebt
+											AND io.amount > 0
+										
+							) risk ON risk.clientFk = c.id
+						GROUP BY risk.companyFk, c.id
+						HAVING receipt > 10
+				) sub ON sub.id = c.id
+			JOIN supplier s ON s.id = sub.companyFk
+			JOIN company co ON co.id = sub.companyFk
+			LEFT JOIN bankEntity be ON be.id = c.bankEntityFk; 
+END$$
+DELIMITER ;
diff --git a/db/routines/vn2008/procedures/CalculoRemesas.sql b/db/routines/vn2008/procedures/CalculoRemesas.sql
deleted file mode 100644
index a4c191a80..000000000
--- a/db/routines/vn2008/procedures/CalculoRemesas.sql
+++ /dev/null
@@ -1,66 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`CalculoRemesas`(IN vFechaRemesa DATE)
-BEGIN
-
-	DROP TEMPORARY TABLE IF EXISTS TMP_REMESAS;
-	CREATE TEMPORARY TABLE TMP_REMESAS 	
-		SELECT
-			CONCAT(p.NIF,REPEAT('0', 12-LENGTH(p.NIF))) as CIF1,
-			cli.Id_Cliente,
-			cli.Cliente,
-			cli.`IF` as NIF,
-			c.PaymentDate as Vencimiento,
-			0 ImporteFac,
-			cast(c.Recibo as decimal(10,2)) as ImporteRec,
-			0 as ImporteActual,
-			c.companyFk empresa_id,
-			cli.RazonSocial,
-			cast(c.Recibo as decimal(10,2)) as ImporteTotal,
-			cast(c.Recibo as decimal(10,2)) as Saldo,
-			p.Proveedor as Empresa,
-			e.abbreviation as EMP,
-			cli.cuenta,
-			iban AS Iban,
-			CONVERT(SUBSTRING(iban,5,4),UNSIGNED INT) AS nrbe,
-			sepavnl as SEPA,
-			corevnl as RecibidoCORE,
-			hasLcr,
-            be.bic,
-            be.`name` entityName
-		FROM Clientes cli
-		JOIN
-			(SELECT risk.companyFk,
-					c.Id_Cliente,
-					sum(risk.amount) as Recibo,
-					IF((c.Vencimiento + graceDays) mod 30.001 <= day(vFechaRemesa)
-						,TIMESTAMPADD(DAY, (c.Vencimiento + graceDays) MOD 30.001, LAST_DAY(TIMESTAMPADD(MONTH,-1,vFechaRemesa)))
-						,TIMESTAMPADD(DAY, (c.Vencimiento + graceDays) MOD 30.001, LAST_DAY(TIMESTAMPADD(MONTH,-2,vFechaRemesa)))    
-						) as PaymentDate												
-			FROM Clientes c
-            JOIN pay_met pm on pm.id = pay_met_id
-			JOIN
-				(
-					SELECT companyFk, clientFk, amount
-						FROM Clientes c 
-							JOIN vn.clientRisk cr ON cr.clientFk = c.Id_Cliente
-						WHERE pay_met_id = 4
-					
-				UNION ALL
-                    
-					SELECT io.companyFk, io.clientFk Id_Cliente, - io.amount
-						FROM vn.invoiceOut io 
-							JOIN Clientes c ON c.Id_Cliente = io.clientFk
-							JOIN pay_met pm on pm.id = pay_met_id
-						WHERE io.dued > vFechaRemesa
-							AND pay_met_id = 4 AND pm.deudaviva
-							AND io.amount > 0
-						
-				) risk ON c.Id_Cliente = risk.clientFk
-				GROUP BY risk.companyFk, Id_Cliente
-			HAVING Recibo > 10
-			) c on c.Id_Cliente = cli.Id_Cliente
-		JOIN Proveedores p on p.Id_Proveedor = c.companyFk
-		JOIN empresa e on e.id = c.companyFk
-        LEFT JOIN vn.bankEntity be ON be.id = cli.bankEntityFk; 
-END$$
-DELIMITER ;
diff --git a/db/routines/vn2008/procedures/cacheReset.sql b/db/routines/vn2008/procedures/cacheReset.sql
deleted file mode 100644
index f36169fda..000000000
--- a/db/routines/vn2008/procedures/cacheReset.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`cacheReset`(vCacheName VARCHAR(10), vParams VARCHAR(15))
-BEGIN
-
-	UPDATE cache.cache_calc 
-		SET expires = util.VN_NOW() 
-		WHERE cacheName = vCacheName collate utf8_unicode_ci
-        AND params = vParams collate utf8_unicode_ci;
-
-END$$
-DELIMITER ;
diff --git a/db/routines/vn2008/procedures/camiones.sql b/db/routines/vn2008/procedures/camiones.sql
deleted file mode 100644
index 4c37cf9da..000000000
--- a/db/routines/vn2008/procedures/camiones.sql
+++ /dev/null
@@ -1,23 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`camiones`(vWarehouse INT, vDate DATE)
-BEGIN
-	SELECT Temperatura
-		,ROUND(SUM(Etiquetas * volume)) AS cm3 
-		,ROUND(SUM(IF(scanned, Etiquetas, 0) * volume)) AS cm3s
-		,ROUND(SUM(Vida * volume)) AS cm3e 
-		FROM (
-			SELECT t.Temperatura, c.Etiquetas, b.scanned, c.Vida,
-					IF(cu.Volumen > 0, cu.Volumen, cu.x * cu.y * IF(cu.z > 0, cu.z, a.Medida + 10)) volume
-				FROM Compres c
-					LEFT JOIN buy_edi b ON b.id = c.buy_edi_id
-					JOIN Articles a ON a.Id_Article = c.Id_Article
-					JOIN Tipos t ON t.tipo_id = a.tipo_id
-					JOIN Entradas e ON e.Id_Entrada = c.Id_Entrada
-					JOIN travel tr ON tr.id = e.travel_id
-					JOIN Cubos cu ON cu.Id_Cubo = c.Id_Cubo
-				WHERE tr.warehouse_id = vWarehouse
-					AND tr.landing = vDate
-		) sub
-		GROUP BY Temperatura;
-END$$
-DELIMITER ;
diff --git a/db/routines/vn2008/procedures/cobro.sql b/db/routines/vn2008/procedures/cobro.sql
deleted file mode 100644
index 26d906813..000000000
--- a/db/routines/vn2008/procedures/cobro.sql
+++ /dev/null
@@ -1,79 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`cobro`(IN datFEC DATE
-                      , IN idCLI INT
-                      , IN dblIMPORTE DOUBLE
-                      , IN idCAJA INT
-                      , IN idPAYMET INT
-                      , IN strCONCEPTO VARCHAR(40)
-                      , IN idEMP INT
-                      , IN idWH INT
-                      , IN idTRABAJADOR INT)
-BEGIN
-		
-	DECLARE bolCASH BOOLEAN;
-	DECLARE cuenta_banco BIGINT;
-	DECLARE cuenta_cliente BIGINT;
-	DECLARE max_asien INT;
-	-- XDIARIO
-	-- No se asientan los cobros directamente, salvo en el caso de las cajas de CASH
-	SELECT (at2.code = 'cash') INTO bolCASH FROM Bancos b JOIN vn.accountingType at2 ON at2.id = b.cash WHERE b.Id_Banco = idCAJA;
-	IF bolCASH  THEN 
-		SELECT Cuenta INTO cuenta_banco 
-			FROM Bancos 
-			WHERE Id_Banco = idCAJA;
-		SELECT Cuenta INTO cuenta_cliente 
-			FROM Clientes 
-			WHERE Id_Cliente = idCLI;
-		CALL vn.ledger_next(max_asien);
-		INSERT INTO vn.XDiario (ASIEN,FECHA,SUBCTA,CONTRA,CONCEPTO,EURODEBE,EUROHABER,empresa_id)
-			SELECT max_asien,datFEC,SUBCTA,CONTRA,strCONCEPTO,EURODEBE,EUROHABER,idEMP 
-				FROM(SELECT cuenta_banco SUBCTA, cuenta_cliente CONTRA, 0 EURODEBE, dblIMPORTE EUROHABER
-					 UNION ALL
-					 SELECT cuenta_cliente SUBCTA, cuenta_banco CONTRA, dblIMPORTE EURODEBE, 0 EUROHABER
-				    ) gf;
-	END IF;
-    
-	-- CAJERA
-	INSERT INTO Cajas(Id_Trabajador,
-					  Id_Banco,
-					  Entrada,
-					  Concepto,
-					  Cajafecha,
-					  Serie,
-					  Partida,
-					  Numero,
-					  empresa_id,
-					  warehouse_id
-					 )
-	VALUES (idTRABAJADOR,
-			idCAJA,
-			dblIMPORTE,
-			strCONCEPTO,
-			datFEC,
-			'A',
-			TRUE,
-			idCLI,
-			idEMP,
-			idWH 
-		   );
-
-	-- RECIBO
-	INSERT INTO Recibos(Entregado,
-					    Fechacobro,
-					    Id_Trabajador,
-					    Id_Banco,
-					    Id_Cliente,
-					    Id_Factura,
-					    empresa_id
-					   )
-	VALUES ( dblIMPORTE,
-			 datFEC,
-			 idTRABAJADOR,
-			 idCAJA,
-			 idCLI,
-			 strCONCEPTO,
-			 idEMP
-			);
-		   
-END$$
-DELIMITER ;
diff --git a/db/routines/vn2008/procedures/confection_control_source.sql b/db/routines/vn2008/procedures/confection_control_source.sql
deleted file mode 100644
index 77b4df5f3..000000000
--- a/db/routines/vn2008/procedures/confection_control_source.sql
+++ /dev/null
@@ -1,105 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`confection_control_source`(vDated DATE, vScopeDays TINYINT)
-BEGIN
-
-	DECLARE vMidnight DATETIME DEFAULT TIMESTAMP(vDated,'23:59:59');
-	DECLARE vEndingDate DATETIME DEFAULT TIMESTAMPADD(DAY,vScopeDays,vMidnight);
-	DECLARE maxAlertLevel INT DEFAULT 2;
-
-	DROP TEMPORARY TABLE IF EXISTS tmp.production_buffer;
-
-	CREATE TEMPORARY TABLE tmp.production_buffer
-	ENGINE = MEMORY
-		SELECT 
-			date(t.Fecha) as Fecha,
-			hour(t.Fecha) as Hora,
-			hour(t.Fecha) as Departure,
-			t.Id_Ticket,
-            m.Id_Movimiento,
-			m.Cantidad,
-			m.Concepte,
-            ABS(m.Reservado) Reservado,
-			i.Categoria,
-            tp.Tipo,
-			t.Alias as Cliente,
-			wh.name as Almacen,
-			t.warehouse_id,
-			cs.province_id,
-			a.agency_id,
-            ct.description as Taller,
-            stock.visible,
-            stock.available
-		FROM vn2008.Tickets t
-			JOIN vn2008.Agencias a ON a.Id_Agencia = t.Id_Agencia
-			JOIN vn.warehouse wh ON wh.id = t.warehouse_id
-			JOIN vn2008.Movimientos m ON m.Id_Ticket = t.Id_Ticket
-            JOIN vn2008.Articles i ON i.Id_Article = m.Id_Article
-			JOIN vn2008.Tipos tp ON tp.tipo_id = i.tipo_id
-            JOIN vn.confectionType ct ON ct.id = tp.confeccion
-			JOIN vn2008.Consignatarios cs on cs.Id_Consigna = t.Id_Consigna
-			LEFT JOIN vn.ticketState tls on tls.ticketFk = t.Id_Ticket
-            LEFT JOIN 
-				(					
-					SELECT item_id, sum(visible) visible, sum(available) available
-					FROM
-					(
-					SELECT a.item_id, 0 as visible, a.available
-					FROM cache.cache_calc cc
-					LEFT JOIN cache.available a ON a.calc_id = cc.id
-					WHERE cc.cache_id IN (2,8) 
-						AND cc.params IN (concat("1/", util.VN_CURDATE()),concat("44/", util.VN_CURDATE()))
-
-					UNION ALL
-
-					SELECT v.item_id, v.visible, 0 as available
-					FROM cache.cache_calc cc
-					LEFT JOIN cache.visible v ON v.calc_id = cc.id
-					where cc.cache_id IN (2,8) and cc.params IN ("1","44")
-					) sub
-					GROUP BY item_id
-                ) stock ON stock.item_id = m.Id_Article
-		WHERE tp.confeccion 
-			AND tls.alertLevel < maxAlertLevel
-			AND wh.hasConfectionTeam
-			AND t.Fecha BETWEEN vDated AND vEndingDate
-            AND m.Cantidad > 0;
-
-	-- Entradas
-
-	INSERT INTO tmp.production_buffer(
-										Fecha,
-										Id_Ticket,
-										Cantidad,
-										Concepte,
-										Categoria,
-										Cliente,
-										Almacen,
-                                        Taller
-										)
-	    SELECT 
-				tr.shipment AS Fecha, 
-				e.Id_Entrada AS Id_Ticket,
-				c.Cantidad,
-				a.Article,
-				a.Categoria,
-				whi.name as Cliente,
-				who.name as Almacen,
-				ct.description as Taller
-			FROM vn2008.Compres c
-				JOIN vn2008.Entradas e ON e.Id_Entrada = c.Id_Entrada
-				JOIN vn2008.travel tr ON tr.id = e.travel_id
-				JOIN vn.warehouse whi ON whi.id = tr.warehouse_id
-				JOIN vn.warehouse who ON who.id = tr.warehouse_id_out
-				JOIN vn2008.Articles a ON a.Id_Article = c.Id_Article
-				JOIN vn2008.Tipos tp ON tp.tipo_id = a.tipo_id
-				JOIN vn.confectionType ct ON ct.id = tp.confeccion
-			WHERE who.hasConfectionTeam
-				AND tp.confeccion
-				AND tr.shipment BETWEEN vDated AND vEndingDate;
-                
-		
-		SELECT * FROM tmp.production_buffer;
-
-	
-END$$
-DELIMITER ;
diff --git a/db/versions/10925-orangeLaurel/00-firstScript.sql b/db/versions/10925-orangeLaurel/00-firstScript.sql
new file mode 100644
index 000000000..049627082
--- /dev/null
+++ b/db/versions/10925-orangeLaurel/00-firstScript.sql
@@ -0,0 +1,15 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`confection_controlSource`()
+BEGIN
+    SELECT 1;
+END$$
+DELIMITER ;
+GRANT EXECUTE ON PROCEDURE vn.confection_controlSource TO handmadeBoss, productionAssi, artificialBoss;
+
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`remittance_calc`()
+BEGIN
+    SELECT 1;
+END$$
+DELIMITER ;
+GRANT EXECUTE ON PROCEDURE vn.remittance_calc TO financial;
\ No newline at end of file

From 28dbb200fcb51350b641c4e462cfd6ece24549fc Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Mon, 4 Mar 2024 08:38:24 +0100
Subject: [PATCH 12/15] refactor: refs #6874 Proc itemProposal

---
 db/routines/vn/procedures/itemProposal.sql | 97 ++++++++++++++--------
 1 file changed, 63 insertions(+), 34 deletions(-)

diff --git a/db/routines/vn/procedures/itemProposal.sql b/db/routines/vn/procedures/itemProposal.sql
index 74d356d77..cc58715ad 100644
--- a/db/routines/vn/procedures/itemProposal.sql
+++ b/db/routines/vn/procedures/itemProposal.sql
@@ -1,19 +1,23 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemProposal`(vItemFk INT, vTicketFk INT,vShowType BOOL)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemProposal`(
+	vItemFk INT,
+	vTicketFk INT,
+	vShowType BOOL
+)
 BEGIN
-
 /**
- * Propone articulos disponible ordenado, con la cantidad de veces usado y segun sus caracteristicas
- *
- * @param vItemFk item id
- * @param vTicketFk ticket id
- * @param vShowType mostrar tipos
- */
-
+* Propone articulos disponibles ordenados, con la cantidad
+* de veces usado y segun sus caracteristicas.
+*
+* @param vItemFk Id de artículo
+* @param vTicketFk Id de ticket
+* @param vShowType Mostrar tipos
+*/
 	DECLARE vWarehouseFk INT;
 	DECLARE vShipped DATE;
 	DECLARE vCalcFk INT;
 	DECLARE vTypeFk INT;
+	DECLARE vPriority INT DEFAULT 1;
 
 	DECLARE vTag1 VARCHAR(25);
 	DECLARE vTag5 VARCHAR(25);
@@ -27,15 +31,37 @@ BEGIN
 	DECLARE vValue7 VARCHAR(50);
 	DECLARE vValue8 VARCHAR(50);
 
-	SELECT warehouseFk, shipped INTO vWarehouseFk, vShipped
-		FROM vn.ticket
+	SELECT warehouseFk, shipped
+		INTO vWarehouseFk, vShipped
+		FROM ticket
 		WHERE id = vTicketFk;
 
-	SELECT typeFk, tag5, value5, tag6, value6, tag7, value7, tag8, value8, t1.name, it1.value
-		INTO vTypeFk, vTag5, vValue5, vTag6, vValue6, vTag7, vValue7, vTag8, vValue8, vTag1, vValue1
-		FROM vn.item i
-			LEFT JOIN vn.itemTag it1 ON it1.itemFk = i.id AND it1.priority = 1
-				LEFT JOIN vn.tag t1 ON t1.id = it1.tagFk
+	SELECT typeFk,
+			tag5,
+			value5,
+			tag6,
+			value6,
+			tag7,
+			value7,
+			tag8,
+			value8,
+			t.name,
+			it.value
+		INTO vTypeFk,
+				vTag5,
+				vValue5,
+				vTag6,
+				vValue6,
+				vTag7,
+				vValue7,
+				vTag8,
+				vValue8,
+				vTag1,
+				vValue1
+		FROM item i
+			LEFT JOIN itemTag it ON it.itemFk = i.id
+				AND it.priority = vPriority
+			LEFT JOIN tag t ON t.id = it.tagFk
 		WHERE i.id = vItemFk;
 
 	CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, vShipped);
@@ -56,32 +82,35 @@ BEGIN
 			i.value8,
 			(i.value8 <=> vValue8 COLLATE utf8_general_ci) match8,
 			a.available,
-			IFNULL(ip.counter,0) counter,
-			IF(b.groupingMode = 1, b.grouping, b.packing) as minQuantity,
+			IFNULL(ip.counter, 0) `counter`,
+			IF(b.groupingMode = 1, b.grouping, b.packing) minQuantity,
 			iss.visible located
 		FROM item i
 			JOIN cache.available a ON a.item_id = i.id
-			LEFT JOIN itemProposal ip ON ip.mateFk = i.id AND ip.itemFk = vItemFk
-			LEFT JOIN itemTag it1 ON it1.itemFk = i.id AND it1.priority = 1
-			LEFT JOIN tag t1 ON t1.id = it1.tagFk
-			LEFT JOIN cache.last_buy lb ON lb.item_id = i.id AND lb.warehouse_id = vWarehouseFk
+			LEFT JOIN itemProposal ip ON ip.mateFk = i.id
+				AND ip.itemFk = vItemFk
+			LEFT JOIN itemTag it ON it.itemFk = i.id
+				AND it.priority = vPriority
+			LEFT JOIN tag t ON t.id = it.tagFk
+			LEFT JOIN cache.last_buy lb ON lb.item_id = i.id
+				AND lb.warehouse_id = vWarehouseFk
 			LEFT JOIN buy b ON b.id = lb.buy_id
-			LEFT JOIN itemShelvingStock iss ON iss.itemFk = i.id AND iss.warehouseFk = vWarehouseFk
+			LEFT JOIN itemShelvingStock iss ON iss.itemFk = i.id
+				AND iss.warehouseFk = vWarehouseFk
 		WHERE a.calc_id = vCalcFk
-			AND available > 0
-			AND IF(vShowType,i.typeFk = vTypeFk,true)
-			AND i.id != vItemFk
-		ORDER BY counter DESC,
-			(t1.name = vTag1 COLLATE utf8_general_ci) DESC,
-			(it1.value = vValue1 COLLATE utf8_general_ci) DESC,
+			AND a.available > 0
+			AND IF(vShowType, i.typeFk = vTypeFk, TRUE)
+			AND i.id <> vItemFk
+		ORDER BY `counter` DESC,
+			(t.name = vTag1 COLLATE utf8_general_ci) DESC,
+			(it.value = vValue1 COLLATE utf8_general_ci) DESC,
 			(i.tag5 = vTag5 COLLATE utf8_general_ci) DESC,
-			(i.value5 = vValue5 COLLATE utf8_general_ci) DESC,
+			match5 DESC,
 			(i.tag6 = vTag6 COLLATE utf8_general_ci) DESC,
-			(i.value6 = vValue6 COLLATE utf8_general_ci) DESC,
+			match6 DESC,
 			(i.tag7 = vTag7 COLLATE utf8_general_ci) DESC,
-			(i.value7 = vValue7 COLLATE utf8_general_ci) DESC,
+			match7 DESC,
 			(i.tag8 = vTag8 COLLATE utf8_general_ci) DESC,
-			(i.value8 = vValue8 COLLATE utf8_general_ci) DESC;
-
+			match8 DESC;
 END$$
 DELIMITER ;

From cf810fe4977e42d0de9a46334132eecb9d623e9f Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Mon, 4 Mar 2024 13:14:41 +0100
Subject: [PATCH 13/15] refactor: refs #6874 Proc itemProposal

---
 db/routines/vn/procedures/itemProposal.sql    | 116 -------------
 .../vn/procedures/itemProposal_beta.sql       |  76 --------
 db/routines/vn/procedures/item_getSimilar.sql | 162 +++++++++++-------
 3 files changed, 97 insertions(+), 257 deletions(-)
 delete mode 100644 db/routines/vn/procedures/itemProposal.sql
 delete mode 100644 db/routines/vn/procedures/itemProposal_beta.sql

diff --git a/db/routines/vn/procedures/itemProposal.sql b/db/routines/vn/procedures/itemProposal.sql
deleted file mode 100644
index cc58715ad..000000000
--- a/db/routines/vn/procedures/itemProposal.sql
+++ /dev/null
@@ -1,116 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemProposal`(
-	vItemFk INT,
-	vTicketFk INT,
-	vShowType BOOL
-)
-BEGIN
-/**
-* Propone articulos disponibles ordenados, con la cantidad
-* de veces usado y segun sus caracteristicas.
-*
-* @param vItemFk Id de artículo
-* @param vTicketFk Id de ticket
-* @param vShowType Mostrar tipos
-*/
-	DECLARE vWarehouseFk INT;
-	DECLARE vShipped DATE;
-	DECLARE vCalcFk INT;
-	DECLARE vTypeFk INT;
-	DECLARE vPriority INT DEFAULT 1;
-
-	DECLARE vTag1 VARCHAR(25);
-	DECLARE vTag5 VARCHAR(25);
-	DECLARE vTag6 VARCHAR(25);
-	DECLARE vTag7 VARCHAR(25);
-	DECLARE vTag8 VARCHAR(25);
-
-	DECLARE vValue1 VARCHAR(50);
-	DECLARE vValue5 VARCHAR(50);
-	DECLARE vValue6 VARCHAR(50);
-	DECLARE vValue7 VARCHAR(50);
-	DECLARE vValue8 VARCHAR(50);
-
-	SELECT warehouseFk, shipped
-		INTO vWarehouseFk, vShipped
-		FROM ticket
-		WHERE id = vTicketFk;
-
-	SELECT typeFk,
-			tag5,
-			value5,
-			tag6,
-			value6,
-			tag7,
-			value7,
-			tag8,
-			value8,
-			t.name,
-			it.value
-		INTO vTypeFk,
-				vTag5,
-				vValue5,
-				vTag6,
-				vValue6,
-				vTag7,
-				vValue7,
-				vTag8,
-				vValue8,
-				vTag1,
-				vValue1
-		FROM item i
-			LEFT JOIN itemTag it ON it.itemFk = i.id
-				AND it.priority = vPriority
-			LEFT JOIN tag t ON t.id = it.tagFk
-		WHERE i.id = vItemFk;
-
-	CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, vShipped);
-
-	SELECT i.id itemFk,
-			i.longName,
-			i.subName,
-			i.tag5,
-			i.value5,
-			(i.value5 <=> vValue5 COLLATE utf8_general_ci) match5,
-			i.tag6,
-			i.value6,
-			(i.value6 <=> vValue6 COLLATE utf8_general_ci) match6,
-			i.tag7,
-			i.value7,
-			(i.value7 <=> vValue7 COLLATE utf8_general_ci) match7,
-			i.tag8,
-			i.value8,
-			(i.value8 <=> vValue8 COLLATE utf8_general_ci) match8,
-			a.available,
-			IFNULL(ip.counter, 0) `counter`,
-			IF(b.groupingMode = 1, b.grouping, b.packing) minQuantity,
-			iss.visible located
-		FROM item i
-			JOIN cache.available a ON a.item_id = i.id
-			LEFT JOIN itemProposal ip ON ip.mateFk = i.id
-				AND ip.itemFk = vItemFk
-			LEFT JOIN itemTag it ON it.itemFk = i.id
-				AND it.priority = vPriority
-			LEFT JOIN tag t ON t.id = it.tagFk
-			LEFT JOIN cache.last_buy lb ON lb.item_id = i.id
-				AND lb.warehouse_id = vWarehouseFk
-			LEFT JOIN buy b ON b.id = lb.buy_id
-			LEFT JOIN itemShelvingStock iss ON iss.itemFk = i.id
-				AND iss.warehouseFk = vWarehouseFk
-		WHERE a.calc_id = vCalcFk
-			AND a.available > 0
-			AND IF(vShowType, i.typeFk = vTypeFk, TRUE)
-			AND i.id <> vItemFk
-		ORDER BY `counter` DESC,
-			(t.name = vTag1 COLLATE utf8_general_ci) DESC,
-			(it.value = vValue1 COLLATE utf8_general_ci) DESC,
-			(i.tag5 = vTag5 COLLATE utf8_general_ci) DESC,
-			match5 DESC,
-			(i.tag6 = vTag6 COLLATE utf8_general_ci) DESC,
-			match6 DESC,
-			(i.tag7 = vTag7 COLLATE utf8_general_ci) DESC,
-			match7 DESC,
-			(i.tag8 = vTag8 COLLATE utf8_general_ci) DESC,
-			match8 DESC;
-END$$
-DELIMITER ;
diff --git a/db/routines/vn/procedures/itemProposal_beta.sql b/db/routines/vn/procedures/itemProposal_beta.sql
deleted file mode 100644
index 4a6f761a9..000000000
--- a/db/routines/vn/procedures/itemProposal_beta.sql
+++ /dev/null
@@ -1,76 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`itemProposal_beta`(vItemFk INT, vTicketFk INT)
-BEGIN
-
-	DECLARE vWarehouseFk INT;
-    DECLARE vShipped DATE;
-    DECLARE vCalcFk INT;
-    DECLARE vTypeFk INT;
-    DECLARE vResultsMax INT DEFAULT 10;
-    
-    DECLARE vTag1 VARCHAR(25);
-    DECLARE vTag5 VARCHAR(25);
-    DECLARE vTag6 VARCHAR(25);
-    DECLARE vTag7 VARCHAR(25);
-    DECLARE vTag8 VARCHAR(25);
-    
-    DECLARE vValue1 VARCHAR(50);
-    DECLARE vValue5 VARCHAR(50);
-    DECLARE vValue6 VARCHAR(50);
-    DECLARE vValue7 VARCHAR(50);
-    DECLARE vValue8 VARCHAR(50);
-
-	SELECT warehouseFk, shipped INTO vWarehouseFk, vShipped
-		FROM vn.ticket
-        WHERE id = vTicketFk;
-    
-    SELECT typeFk, tag5, value5, tag6, value6, tag7, value7, tag8, value8, t1.name, it1.value
-		INTO vTypeFk, vTag5, vValue5, vTag6, vValue6, vTag7, vValue7, vTag8, vValue8, vTag1, vValue1
-		FROM vn.item i 
-            LEFT JOIN vn.itemTag it1 ON it1.itemFk = i.id AND it1.priority = 1
-				LEFT JOIN vn.tag t1 ON t1.id = it1.tagFk
-        WHERE i.id = vItemFk;
-    
-	CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, vShipped);
-	
-	SELECT i.id itemFk,
-			i.longName,
-            i.subName,
-            i.tag5,
-            i.value5,
-            (i.value5 <=> vValue5 COLLATE utf8_general_ci) match5,
-			i.tag6,
-            i.value6,
-            (i.value6 <=> vValue6 COLLATE utf8_general_ci) match6,
-			i.tag7,
-            i.value7,
-            (i.value7 <=> vValue7 COLLATE utf8_general_ci) match7,
-            i.tag8,
-            i.value8,
-            (i.value8 <=> vValue8 COLLATE utf8_general_ci) match8,
-            a.available,
-            IFNULL(ip.counter,0) counter
-		FROM vn.item i 
-			JOIN cache.available a ON a.item_id = i.id
-            LEFT JOIN vn.itemProposal ip ON ip.mateFk = i.id AND ip.itemFk = vItemFk
-			LEFT JOIN vn.itemTag it1 ON it1.itemFk = i.id AND it1.priority = 1
-				LEFT JOIN vn.tag t1 ON t1.id = it1.tagFk
-		WHERE a.calc_id = vCalcFk
-			AND available > 0
-            AND i.typeFk = vTypeFk
-            AND i.id != vItemFk
-		ORDER BY counter DESC,
-				(t1.name = vTag1 COLLATE utf8_general_ci) DESC,
-                (it1.value = vValue1 COLLATE utf8_general_ci) DESC,
-				(i.tag5 = vTag5 COLLATE utf8_general_ci) DESC,
-				(i.value5 = vValue5 COLLATE utf8_general_ci) DESC,
-				(i.tag6 = vTag6 COLLATE utf8_general_ci) DESC,                
-				(i.value6 = vValue6 COLLATE utf8_general_ci) DESC,
-                (i.tag7 = vTag7 COLLATE utf8_general_ci) DESC,
-				(i.value7 = vValue7 COLLATE utf8_general_ci) DESC,
-                (i.tag8 = vTag8 COLLATE utf8_general_ci) DESC,
-				(i.value8 = vValue8 COLLATE utf8_general_ci) DESC
-		LIMIT vResultsMax;
-
-END$$
-DELIMITER ;
diff --git a/db/routines/vn/procedures/item_getSimilar.sql b/db/routines/vn/procedures/item_getSimilar.sql
index 7cc9ad63e..2522280f7 100644
--- a/db/routines/vn/procedures/item_getSimilar.sql
+++ b/db/routines/vn/procedures/item_getSimilar.sql
@@ -1,20 +1,24 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`item_getSimilar`(vItemFk INT, vWarehouseFk INT, vDate DATE, vIsShowedByType BOOL)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`item_getSimilar`(
+	vSelf INT,
+	vTicketFk INT,
+	vShowType BOOL
+)
 BEGIN
-
 /**
- * Propone articulos similares para posible cambio,
- * ordenado con la cantidad de veces usado y segun sus caracteristicas
- *
- * @param vItemFk item id
- * @param vWarehouseFk warehouse id
- * @param vDate fecha para revisar disponible
- * @param vIsShowedByType para mostrar solo artículos de ese tipo
- */  
+* Propone articulos disponibles ordenados, con la cantidad
+* de veces usado y segun sus caracteristicas.
+*
+* @param vSelf Id de artículo
+* @param vTicketFk Id de ticket
+* @param vShowType Mostrar tipos
+*/
+	DECLARE vWarehouseFk INT;
+	DECLARE vShipped DATE;
+	DECLARE vCalcFk INT;
+	DECLARE vTypeFk INT;
+	DECLARE vPriority INT DEFAULT 1;
 
-    DECLARE vCalcFk INT;
-    DECLARE vTypeFk INT;
-    
     DECLARE vTag1 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
     DECLARE vTag5 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
     DECLARE vTag6 VARCHAR(25) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
@@ -27,58 +31,86 @@ BEGIN
     DECLARE vValue7 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
     DECLARE vValue8 VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
 
-       
-    SELECT typeFk, tag5, value5, tag6, value6, tag7, value7, tag8, value8, t1.name, it1.value
-        INTO vTypeFk, vTag5, vValue5, vTag6, vValue6, vTag7, vValue7, vTag8, vValue8, vTag1, vValue1
-        FROM vn.item i
-            LEFT JOIN vn.itemTag it1 ON it1.itemFk = i.id AND it1.priority = 1
-            LEFT JOIN vn.tag t1 ON t1.id = it1.tagFk
-        WHERE i.id = vItemFk;
-    
-    CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, vDate);
-    
-    SELECT i.id itemFk,
-            i.longName,
-            i.subName,
-            i.tag5,
-            i.value5,
-            (i.value5 <=> vValue5) match5,
-            i.tag6,
-            i.value6,
-            (i.value6 <=> vValue6) match6,
-            i.tag7,
-            i.value7,
-            (i.value7 <=> vValue7) match7,
-            i.tag8,
-            i.value8,
-            (i.value8 <=> vValue8) match8,
-            a.available,
-            IFNULL(ip.counter,0) counter,
-            IF(b.groupingMode = 1, b.grouping, b.packing) as minQuantity
-        FROM vn.item i
-            JOIN cache.available a ON a.item_id = i.id
-            LEFT JOIN vn.itemProposal ip ON ip.mateFk = i.id AND ip.itemFk = vItemFk
-            LEFT JOIN vn.itemTag it1 ON it1.itemFk = i.id AND it1.priority = 1
-			LEFT JOIN vn.tag t1 ON t1.id = it1.tagFk
-			LEFT JOIN cache.last_buy lb ON lb.item_id = i.id AND lb.warehouse_id = vWarehouseFk
-			LEFT JOIN vn.buy b ON b.id = lb.buy_id
-        WHERE a.calc_id = vCalcFk
-            AND available > 0
-            AND IF(vIsShowedByType, i.typeFk = vTypeFk, TRUE)
-            AND i.id != vItemFk
-        ORDER BY counter DESC,
-                (t1.name = vTag1) DESC,
-                (it1.value = vValue1) DESC,
-                (i.tag6 = vTag6) DESC,                
-                (i.value6 = vValue6) DESC,
-                (i.tag5 = vTag5) DESC,
-                (i.value5 = vValue5) DESC,
-                (i.tag7 = vTag7) DESC,
-                (i.value7 = vValue7) DESC,
-                (i.tag8 = vTag8) DESC,
-                (i.value8 = vValue8) DESC
-         LIMIT 30;
-       
+	SELECT warehouseFk, shipped
+		INTO vWarehouseFk, vShipped
+		FROM ticket
+		WHERE id = vTicketFk;
 
+	SELECT typeFk,
+			tag5,
+			value5,
+			tag6,
+			value6,
+			tag7,
+			value7,
+			tag8,
+			value8,
+			t.name,
+			it.value
+		INTO vTypeFk,
+				vTag5,
+				vValue5,
+				vTag6,
+				vValue6,
+				vTag7,
+				vValue7,
+				vTag8,
+				vValue8,
+				vTag1,
+				vValue1
+		FROM item i
+			LEFT JOIN itemTag it ON it.itemFk = i.id
+				AND it.priority = vPriority
+			LEFT JOIN tag t ON t.id = it.tagFk
+		WHERE i.id = vSelf;
+
+	CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, vShipped);
+
+	SELECT i.id itemFk,
+			i.longName,
+			i.subName,
+			i.tag5,
+			i.value5,
+			(i.value5 <=> vValue5) match5,
+			i.tag6,
+			i.value6,
+			(i.value6 <=> vValue6) match6,
+			i.tag7,
+			i.value7,
+			(i.value7 <=> vValue7) match7,
+			i.tag8,
+			i.value8,
+			(i.value8 <=> vValue8) match8,
+			a.available,
+			IFNULL(ip.counter, 0) `counter`,
+			IF(b.groupingMode = 1, b.grouping, b.packing) minQuantity,
+			iss.visible located
+		FROM item i
+			JOIN cache.available a ON a.item_id = i.id
+			LEFT JOIN itemProposal ip ON ip.mateFk = i.id
+				AND ip.itemFk = vSelf
+			LEFT JOIN itemTag it ON it.itemFk = i.id
+				AND it.priority = vPriority
+			LEFT JOIN tag t ON t.id = it.tagFk
+			LEFT JOIN cache.last_buy lb ON lb.item_id = i.id
+				AND lb.warehouse_id = vWarehouseFk
+			LEFT JOIN buy b ON b.id = lb.buy_id
+			LEFT JOIN itemShelvingStock iss ON iss.itemFk = i.id
+				AND iss.warehouseFk = vWarehouseFk
+		WHERE a.calc_id = vCalcFk
+			AND a.available > 0
+			AND IF(vShowType, i.typeFk = vTypeFk, TRUE)
+			AND i.id <> vSelf
+		ORDER BY `counter` DESC,
+			(t.name = vTag1) DESC,
+			(it.value = vValue1) DESC,
+			(i.tag5 = vTag5) DESC,
+			match5 DESC,
+			(i.tag6 = vTag6) DESC,
+			match6 DESC,
+			(i.tag7 = vTag7) DESC,
+			match7 DESC,
+			(i.tag8 = vTag8) DESC,
+			match8 DESC;
 END$$
 DELIMITER ;

From a96743c3b96c81be2ee2a742de056c302c26acac Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Mon, 4 Mar 2024 13:34:42 +0100
Subject: [PATCH 14/15] refactor: refs #6494 Requested changes

---
 .../procedures/confection_controlSource.sql   | 33 +++++++------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/db/routines/vn/procedures/confection_controlSource.sql b/db/routines/vn/procedures/confection_controlSource.sql
index 6cd43036f..f011a52e9 100644
--- a/db/routines/vn/procedures/confection_controlSource.sql
+++ b/db/routines/vn/procedures/confection_controlSource.sql
@@ -15,11 +15,8 @@ BEGIN
  * @param vMaxAlertLevel Id nivel de alerta
  * @param vWarehouseFk Id de almacén
  */
-	DECLARE vMidnight DATETIME DEFAULT util.dayEnd(vDated);
-	DECLARE vEndingDate DATETIME DEFAULT vMidnight + INTERVAL vScopeDays DAY;
+	DECLARE vEndingDate DATETIME DEFAULT util.dayEnd(vDated) + INTERVAL vScopeDays DAY;
 
-	CREATE OR REPLACE TEMPORARY TABLE tConfectionControlSource
-		ENGINE = MEMORY
 		SELECT t.shipped,
 			t.id ticketFk,
 			s.id saleFk,
@@ -73,27 +70,24 @@ BEGIN
 			AND tls.alertLevel < vMaxAlertLevel
 			AND wh.hasConfectionTeam
 			AND t.shipped BETWEEN vDated AND vEndingDate
-			AND s.quantity > 0;
-
-	-- Entradas
-	INSERT INTO tConfectionControlSource(
-			shipped,
-			ticketFk,
-			quantity,
-			concept,
-			category,
-			nickname,
-			warehouse,
-			description
-		)
+			AND s.quantity > 0
+		UNION ALL
 		SELECT tr.shipped, 
 				e.id,
+				NULL,
 				b.quantity,
 				i.name,
+				NULL,
 				i.category,
+				NULL,
 				whi.name,
 				who.name,
-				ct.description
+				NULL,
+				NULL,
+				NULL,
+				ct.description,
+				NULL,
+				NULL
 			FROM buy b
 				JOIN `entry` e ON e.id = b.entryFk
 				JOIN travel tr ON tr.id = e.travelFk
@@ -105,8 +99,5 @@ BEGIN
 			WHERE who.hasConfectionTeam
 				AND it.making
 				AND tr.shipped BETWEEN vDated AND vEndingDate;
-
-	SELECT * FROM tConfectionControlSource;
-	DROP TEMPORARY TABLE tConfectionControlSource;
 END$$
 DELIMITER ;

From fa70eeb75c78b95960c0ce265e038d77f52c4b2b Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Mon, 4 Mar 2024 13:42:11 +0100
Subject: [PATCH 15/15] refactor: refs #6499 Requested changes

---
 .../procedures/{pay.sql => payment_add.sql}   |  5 ++--
 .../10924-pinkCordyline/00-firstScript.sql    | 29 ++++++++++++++++++-
 2 files changed, 31 insertions(+), 3 deletions(-)
 rename db/routines/vn/procedures/{pay.sql => payment_add.sql} (93%)

diff --git a/db/routines/vn/procedures/pay.sql b/db/routines/vn/procedures/payment_add.sql
similarity index 93%
rename from db/routines/vn/procedures/pay.sql
rename to db/routines/vn/procedures/payment_add.sql
index 2ef9ca2d6..061a75848 100644
--- a/db/routines/vn/procedures/pay.sql
+++ b/db/routines/vn/procedures/payment_add.sql
@@ -1,5 +1,5 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`pay`(
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`payment_add`(
 	vDated DATE,
 	vSupplierFk INT,
 	vAmount DOUBLE,
@@ -12,7 +12,8 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`pay`(
 	vCompanyFk INT)
 BEGIN
 /**
- * Registra un pago realizado a un proveedor.
+ * Registra un pago realizado a un proveedor y
+ * su correspondiente registro en caja.
  *
  * @param vDated Fecha del pago
  * @param vSupplierFk Id del proveedor
diff --git a/db/versions/10924-pinkCordyline/00-firstScript.sql b/db/versions/10924-pinkCordyline/00-firstScript.sql
index ea04623cd..1c6c1c0f8 100644
--- a/db/versions/10924-pinkCordyline/00-firstScript.sql
+++ b/db/versions/10924-pinkCordyline/00-firstScript.sql
@@ -1,4 +1,31 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`balanceNestTree_addChild`()
+BEGIN
+    SELECT 1;
+END$$
+DELIMITER ;
 GRANT EXECUTE ON PROCEDURE vn.balanceNestTree_addChild TO adminBoss;
+
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`balanceNestTree_delete`()
+BEGIN
+    SELECT 1;
+END$$
+DELIMITER ;
 GRANT EXECUTE ON PROCEDURE vn.balanceNestTree_delete TO adminBoss;
+
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`balanceNestTree_move`()
+BEGIN
+    SELECT 1;
+END$$
+DELIMITER ;
 GRANT EXECUTE ON PROCEDURE vn.balanceNestTree_move TO adminBoss;
-GRANT EXECUTE ON PROCEDURE vn.pay TO financial;
+
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`payment_add`()
+BEGIN
+    SELECT 1;
+END$$
+DELIMITER ;
+GRANT EXECUTE ON PROCEDURE vn.payment_add TO financial;