From 1ccec1e0fb5ab8d5b747431693a5ce49860e7a73 Mon Sep 17 00:00:00 2001
From: ivanm <ivanm@verdnatura.es>
Date: Mon, 4 Mar 2024 08:11:06 +0100
Subject: [PATCH 01/22] refs #6499 procRefactor part 6

---
 .../procedures/absoluteInventoryHistory.sql   | 99 +++++++++++++++++++
 1 file changed, 99 insertions(+)
 create mode 100644 db/routines/vn/procedures/absoluteInventoryHistory.sql

diff --git a/db/routines/vn/procedures/absoluteInventoryHistory.sql b/db/routines/vn/procedures/absoluteInventoryHistory.sql
new file mode 100644
index 000000000..427b9ba51
--- /dev/null
+++ b/db/routines/vn/procedures/absoluteInventoryHistory.sql
@@ -0,0 +1,99 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`absoluteInventoryHistory`(
+    vIdArticle INT, vWarehouse INT, vDate DATETIME)
+BEGIN
+/**
+* Calcula y proporciona un historial de inventario absoluto
+* para un artículo específico en un almacén dado
+* hasta una fecha determinada.
+*
+* @param vIdArticle Id de artículo
+* @param vWarehouse Almacén
+* @param vDate Fecha
+*/
+	DECLARE vCalculatedInventory INT;
+	DECLARE vToday DATETIME;
+	
+	SET vToday = util.VN_CURDATE();
+
+	CREATE OR REPLACE TEMPORARY TABLE historicalPast
+        ENGINE = MEMORY
+		SELECT *
+			FROM (
+				SELECT tr.landed Fecha,
+						b.quantity Entrada,
+						NULL Salida,
+						(tr.isReceived != FALSE) OK,
+						s.name Alias,
+						e.invoiceNumber Referencia,
+						e.id id,
+						tr.isDelivered F5
+					FROM buy b
+                        JOIN entry e ON e.id = b.entryFk
+						JOIN travel tr ON tr.id = e.travelFk
+                        JOIN supplier s ON s.id = e.supplierFk
+					WHERE tr.landed >= '2001-01-01'
+						AND s.id <> 4
+						AND vWarehouse IN (tr.warehouseInFk, 0)
+						AND b.itemFk = vIdArticle
+						AND e.isExcludedFromAvailable = 0
+						AND e.isRaid = 0
+				UNION ALL
+				SELECT tr.shipped Fecha,
+						NULL Entrada,
+						b.quantity Salida,
+						tr.isDelivered OK,
+						s.name Alias,
+						e.invoiceNumber Referencia,
+						e.id id,
+						tr.isDelivered F5
+					FROM buy b
+						JOIN entry e ON e.id = b.entryFk
+						JOIN travel tr ON tr.id = e.travelFk
+                        JOIN supplier s ON s.id = e.supplierFk
+					WHERE tr.shipped >= '2001-01-01'
+						AND vWarehouse = tr.warehouseOutFk
+						AND s.id <> 4
+						AND b.itemFk = vIdArticle
+						AND e.isExcludedFromAvailable = 0
+						AND e.isRaid = 0
+				UNION ALL
+				SELECT t.shipped Fecha,
+						NULL Entrada,
+						m.quantity Salida,
+						(m.isPicked <> 0 OR t.isLabeled <> 0 OR t.refFk IS NOT NULL) OK,
+						t.nickname Alias,
+						t.refFk Referencia,
+						t.id,
+						t.isPrinted
+					FROM sale m
+						JOIN Tickets T USING (Id_Ticket)
+						JOIN Clientes C ON C.Id_Cliente = T.Id_Cliente
+					WHERE T.Fecha >= '2001-01-01'
+						AND M.Id_Article = vIdArticle
+						AND vWarehouse IN (T.warehouse_id , 0)
+			) t1 
+			ORDER BY Fecha, Entrada DESC, OK DESC;
+
+	SELECT sum(Entrada) - sum(Salida) INTO vCalculatedInventory
+		FROM historicalPast
+			WHERE Fecha < vDate;
+
+	SELECT p1.*, NULL v_virtual 
+		FROM(
+			SELECT vDate Fecha,
+				vCalculatedInventory Entrada,
+				NULL Salida,
+				1 OK,
+				'Inventario calculado' Alias,
+				'' Referencia, 0 id,
+				1 F5
+			UNION ALL
+			SELECT * 
+				FROM historicalPast
+					WHERE Fecha >= vDate
+			) p1;
+	
+	DROP TEMPORARY TABLE historicalPast;
+END$$
+DELIMITER ;
\ No newline at end of file

From 68846d30184961cd92704a65c95617b58876ee40 Mon Sep 17 00:00:00 2001
From: ivanm <ivanm@verdnatura.es>
Date: Tue, 5 Mar 2024 13:43:03 +0100
Subject: [PATCH 02/22] refs #6499 Refactor historico_multiple

---
 .../procedures/absoluteInventoryHistory.sql   | 109 ++++++------
 .../procedures/multipleInventoryHistory.sql   | 161 ++++++++++++++++++
 2 files changed, 216 insertions(+), 54 deletions(-)
 create mode 100644 db/routines/vn/procedures/multipleInventoryHistory.sql

diff --git a/db/routines/vn/procedures/absoluteInventoryHistory.sql b/db/routines/vn/procedures/absoluteInventoryHistory.sql
index 427b9ba51..f1a317598 100644
--- a/db/routines/vn/procedures/absoluteInventoryHistory.sql
+++ b/db/routines/vn/procedures/absoluteInventoryHistory.sql
@@ -1,13 +1,13 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`absoluteInventoryHistory`(
-    vIdArticle INT, vWarehouse INT, vDate DATETIME)
+    vItemFk INT, vWarehouse INT, vDate DATETIME)
 BEGIN
 /**
 * Calcula y proporciona un historial de inventario absoluto
 * para un artículo específico en un almacén dado
 * hasta una fecha determinada.
 *
-* @param vIdArticle Id de artículo
+* @param vItemFk Id de artículo
 * @param vWarehouse Almacén
 * @param vDate Fecha
 */
@@ -16,84 +16,85 @@ BEGIN
 	
 	SET vToday = util.VN_CURDATE();
 
-	CREATE OR REPLACE TEMPORARY TABLE historicalPast
-        ENGINE = MEMORY
+	CREATE OR REPLACE TEMPORARY TABLE tHistoricalPast
+		ENGINE = MEMORY
 		SELECT *
 			FROM (
-				SELECT tr.landed Fecha,
-						b.quantity Entrada,
-						NULL Salida,
-						(tr.isReceived != FALSE) OK,
-						s.name Alias,
-						e.invoiceNumber Referencia,
+				SELECT tr.landed `date`,
+						b.quantity input,
+						NULL `output`,
+						(tr.isReceived != FALSE) ok,
+						s.name alias,
+						e.invoiceNumber reference,
 						e.id id,
-						tr.isDelivered F5
+						tr.isDelivered f5
 					FROM buy b
-                        JOIN entry e ON e.id = b.entryFk
+						JOIN `entry` e ON e.id = b.entryFk
 						JOIN travel tr ON tr.id = e.travelFk
-                        JOIN supplier s ON s.id = e.supplierFk
+						JOIN supplier s ON s.id = e.supplierFk
 					WHERE tr.landed >= '2001-01-01'
 						AND s.id <> 4
 						AND vWarehouse IN (tr.warehouseInFk, 0)
-						AND b.itemFk = vIdArticle
-						AND e.isExcludedFromAvailable = 0
-						AND e.isRaid = 0
+						AND b.itemFk = vItemFk
+						AND NOT e.isExcludedFromAvailable
+						AND NOT e.isRaid
 				UNION ALL
-				SELECT tr.shipped Fecha,
-						NULL Entrada,
-						b.quantity Salida,
-						tr.isDelivered OK,
-						s.name Alias,
-						e.invoiceNumber Referencia,
+				SELECT tr.shipped `date`,
+						NULL input,
+						b.quantity `output`,
+						tr.isDelivered ok,
+						s.name alias,
+						e.invoiceNumber reference,
 						e.id id,
-						tr.isDelivered F5
+						tr.isDelivered f5
 					FROM buy b
-						JOIN entry e ON e.id = b.entryFk
+						JOIN `entry` e ON e.id = b.entryFk
 						JOIN travel tr ON tr.id = e.travelFk
-                        JOIN supplier s ON s.id = e.supplierFk
+						JOIN supplier s ON s.id = e.supplierFk
 					WHERE tr.shipped >= '2001-01-01'
 						AND vWarehouse = tr.warehouseOutFk
 						AND s.id <> 4
-						AND b.itemFk = vIdArticle
-						AND e.isExcludedFromAvailable = 0
-						AND e.isRaid = 0
+						AND b.itemFk = vItemFk
+						AND NOT e.isExcludedFromAvailable
+						AND NOT e.isRaid
 				UNION ALL
-				SELECT t.shipped Fecha,
-						NULL Entrada,
-						m.quantity Salida,
-						(m.isPicked <> 0 OR t.isLabeled <> 0 OR t.refFk IS NOT NULL) OK,
-						t.nickname Alias,
-						t.refFk Referencia,
+				SELECT t.shipped `date`,
+						NULL input,
+						m.quantity `output`,
+						(m.isPicked <> 0 OR t.isLabeled <> 0 OR t.refFk IS NOT NULL) ok,
+						t.nickname alias,
+						t.refFk reference,
 						t.id,
 						t.isPrinted
 					FROM sale m
-						JOIN Tickets T USING (Id_Ticket)
-						JOIN Clientes C ON C.Id_Cliente = T.Id_Cliente
-					WHERE T.Fecha >= '2001-01-01'
-						AND M.Id_Article = vIdArticle
-						AND vWarehouse IN (T.warehouse_id , 0)
+						JOIN ticket t ON t.id = m.ticketFk
+						JOIN client c ON c.id = t.clientFk
+					WHERE t.shipped >= '2001-01-01'
+						AND m.itemFk = vItemFk
+						AND vWarehouse IN (t.warehouseFk , 0)
 			) t1 
-			ORDER BY Fecha, Entrada DESC, OK DESC;
+			ORDER BY `date`, input DESC, ok DESC;
 
-	SELECT sum(Entrada) - sum(Salida) INTO vCalculatedInventory
-		FROM historicalPast
-			WHERE Fecha < vDate;
+	SELECT sum(input) - sum(`output`) INTO vCalculatedInventory
+		FROM tHistoricalPast
+			WHERE `date` < vDate;
 
 	SELECT p1.*, NULL v_virtual 
 		FROM(
-			SELECT vDate Fecha,
-				vCalculatedInventory Entrada,
-				NULL Salida,
-				1 OK,
-				'Inventario calculado' Alias,
-				'' Referencia, 0 id,
-				1 F5
+			SELECT vDate `date`,
+				vCalculatedInventory input,
+				NULL `output`,
+				1 ok,
+				'Inventario calculado' alias,
+				'' reference,
+				0 id,
+				1 f5
 			UNION ALL
-			SELECT * 
-				FROM historicalPast
-					WHERE Fecha >= vDate
+			SELECT *
+				FROM tHistoricalPast
+					WHERE `date` >= vDate
 			) p1;
 	
-	DROP TEMPORARY TABLE historicalPast;
+	DROP TEMPORARY TABLE tHistoricalPast;
 END$$
 DELIMITER ;
\ No newline at end of file
diff --git a/db/routines/vn/procedures/multipleInventoryHistory.sql b/db/routines/vn/procedures/multipleInventoryHistory.sql
new file mode 100644
index 000000000..bd399e889
--- /dev/null
+++ b/db/routines/vn/procedures/multipleInventoryHistory.sql
@@ -0,0 +1,161 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`multipleInventoryHistory`(
+    vItemFk INT)
+BEGIN
+/**
+* Calcula y proporciona un historial de inventario detallado
+* para un artículo dividiendo la información
+* por almacén.
+*
+* @param vItemFk Artículo
+*/
+	DECLARE vDateInventory DATETIME;
+
+	SELECT inventoried INTO vDateInventory FROM config;
+
+	DROP TEMPORARY TABLE IF EXISTS tMultipleHistory1;
+
+	CREATE TEMPORARY TABLE tMultipleHistory1
+	SELECT DATE(`date`) `date`,
+	    input,
+		`output`,
+		ok,
+		reference,
+		history.id,
+		warehouse,
+		`name` warehouseName
+	    FROM ( 
+            SELECT tr.landed `date`,
+				c.quantity input,
+				NULL `output`,
+				IF(warehouseInFk = 44, 1, warehouseInFk) warehouse,
+				(tr.isReceived <> FALSE) ok,
+				e.invoiceNumber reference,
+				e.id id	 
+		        FROM buy c
+                    JOIN `entry` e ON e.id = c.entryFk
+		            JOIN travel tr ON tr.id = e.travelFk
+		        WHERE tr.landed >= vDateInventory
+		            AND c.itemFk = vItemFk
+		            AND NOT e.isRaid
+		            AND c.quantity <> 0  
+		    UNION ALL
+		    SELECT tr.shipped `date`,
+				NULL input,
+				c.quantity `output`,
+				warehouseOutFk warehouse,
+				tr.isDelivered ok,
+				e.invoiceNumber reference,
+				e.id id
+		        FROM buy c
+                    JOIN `entry` e ON e.id = c.entryFk
+		            JOIN travel tr ON tr.id = e.travelFk
+		        WHERE tr.shipped >= vDateInventory
+		            AND c.itemFk = vItemFk
+		            AND NOT e.isRaid
+		            AND c.quantity <> 0
+            UNION ALL
+            SELECT t.shipped `date`,
+				NULL input,
+				m.quantity `output`,
+				warehouseInFk warehouse,
+				(m.isPicked <> 0 OR t.isLabeled <> 0 OR t.refFk IS NOT NULL) ok,
+				t.refFk reference,
+				t.id id
+			    FROM sale m
+                    JOIN ticket t ON t.id = m.ticketFk
+			    WHERE t.shipped >= vDateInventory
+				    AND m.itemFk = vItemFk
+		 ) history
+		    JOIN warehouse ON warehouse.id = history.warehouse
+	        ORDER BY `date`, input DESC, ok DESC;
+
+	DROP TEMPORARY TABLE IF EXISTS tMultipleHistory2;
+	DROP TEMPORARY TABLE IF EXISTS tMultipleHistory3;
+	DROP TEMPORARY TABLE IF EXISTS tMultipleHistory4;
+	DROP TEMPORARY TABLE IF EXISTS tMultipleHistory5;
+	DROP TEMPORARY TABLE IF EXISTS tMultipleHistory6;
+	DROP TEMPORARY TABLE IF EXISTS tMultipleHistory7;
+	DROP TEMPORARY TABLE IF EXISTS tMultipleHistory8;
+	CREATE TEMPORARY TABLE tMultipleHistory2 SELECT * FROM tMultipleHistory1 WHERE warehouse = 19;
+	CREATE TEMPORARY TABLE tMultipleHistory3 SELECT * FROM tMultipleHistory1 WHERE warehouse = 7;
+	CREATE TEMPORARY TABLE tMultipleHistory4 SELECT * FROM tMultipleHistory1 WHERE warehouse = 60;
+	CREATE TEMPORARY TABLE tMultipleHistory5 SELECT * FROM tMultipleHistory1 WHERE warehouse = 5;
+	CREATE TEMPORARY TABLE tMultipleHistory6 SELECT * FROM tMultipleHistory1 WHERE warehouse = 17;
+	CREATE TEMPORARY TABLE tMultipleHistory7 SELECT * FROM tMultipleHistory1 WHERE warehouse = 37;
+	CREATE TEMPORARY TABLE tMultipleHistory8 SELECT * FROM tMultipleHistory1 WHERE warehouse = 55;
+
+	SELECT *
+        FROM (
+            SELECT `date`, input BOGinput, `output` BOGoutput, ok BOGok, reference BOGreference, id BOGid,
+            NULL VNHinput, NULL VNHoutput, NULL VNHok, NULL VNHreference, NULL VNHid,
+            NULL ALGinput, NULL ALGoutput, NULL ALGok, NULL ALGreference, NULL ALGid,
+            NULL MADinput, NULL MADoutput, NULL MADok, NULL MADreference, NULL MADid,
+            NULL MCFinput, NULL MCFoutput, NULL MCFok, NULL MCFreference, NULL MCFid,
+            NULL VILinput, NULL VILoutput, NULL VILok, NULL VILreference, NULL VILid,
+            NULL BARinput, NULL BARoutput, NULL BARok, NULL BARreference, NULL BARid
+                FROM tMultipleHistory2 
+            UNION ALL
+            SELECT `date`,
+            NULL, NULL, NULL, NULL, NULL,
+            input, `output`, ok, reference, id,
+            NULL, NULL, NULL, NULL, NULL,
+            NULL, NULL, NULL, NULL, NULL,
+            NULL, NULL, NULL, NULL, NULL,
+            NULL, NULL, NULL, NULL, NULL,
+            NULL, NULL, NULL, NULL, NULL
+	            FROM tMultipleHistory3
+            UNION ALL
+            SELECT `date`,
+            NULL, NULL, NULL, NULL, NULL,
+            NULL, NULL, NULL, NULL, NULL,
+            input, `output`, ok, reference, id,
+            NULL, NULL, NULL, NULL, NULL,
+            NULL, NULL, NULL, NULL, NULL,
+            NULL, NULL, NULL, NULL, NULL,
+            NULL, NULL, NULL, NULL, NULL
+	            FROM tMultipleHistory4
+            UNION ALL
+            SELECT `date`,
+            NULL, NULL, NULL, NULL, NULL,
+            NULL, NULL, NULL, NULL, NULL,
+            NULL, NULL, NULL, NULL, NULL,
+            input, `output`, ok, reference, id,
+            NULL, NULL, NULL, NULL, NULL,
+            NULL, NULL, NULL, NULL, NULL,
+            NULL, NULL, NULL, NULL, NULL
+	            FROM tMultipleHistory5
+            UNION ALL
+            SELECT `date`,
+            NULL, NULL, NULL, NULL, NULL,
+            NULL, NULL, NULL, NULL, NULL,
+            NULL, NULL, NULL, NULL, NULL,
+            NULL, NULL, NULL, NULL, NULL,
+            input, `output`, ok, reference, id,
+            NULL, NULL, NULL, NULL, NULL,
+            NULL, NULL, NULL, NULL, NULL
+                FROM tMultipleHistory6
+            UNION ALL
+            SELECT `date`,
+            NULL, NULL, NULL, NULL, NULL,
+            NULL, NULL, NULL, NULL, NULL,
+            NULL, NULL, NULL, NULL, NULL,
+            NULL, NULL, NULL, NULL, NULL,
+            NULL, NULL, NULL, NULL, NULL,
+            input, `output`, ok, reference, id,
+            NULL, NULL, NULL, NULL, NULL
+                FROM tMultipleHistory7
+            UNION ALL
+            SELECT `date`,
+            NULL, NULL, NULL, NULL, NULL,
+            NULL, NULL, NULL, NULL, NULL,
+            NULL, NULL, NULL, NULL, NULL,
+            NULL, NULL, NULL, NULL, NULL,
+            NULL, NULL, NULL, NULL, NULL,
+            NULL, NULL, NULL, NULL, NULL,
+            input, `output`, ok, reference, id
+		        FROM tMultipleHistory8
+        ) sub
+        ORDER BY `date`, BOGinput IS NULL, VNHinput IS NULL, ALGinput IS NULL, MADinput IS NULL, MCFinput IS NULL, VILinput IS NULL, BARinput IS NULL;
+END$$
+DELIMITER ;
\ No newline at end of file

From f215ce5f05e4812a477fd1d6c3bf1d602c447275 Mon Sep 17 00:00:00 2001
From: ivanm <ivanm@verdnatura.es>
Date: Tue, 5 Mar 2024 14:33:16 +0100
Subject: [PATCH 03/22] refs #6498 Delete procedures vn2008 and grant vn procs

---
 .../vn2008/procedures/historico_absoluto.sql  |  91 --------
 .../vn2008/procedures/historico_multiple.sql  | 206 ------------------
 .../10932-azureEucalyptus/00-firstScript.sql  |   2 +
 3 files changed, 2 insertions(+), 297 deletions(-)
 delete mode 100644 db/routines/vn2008/procedures/historico_absoluto.sql
 delete mode 100644 db/routines/vn2008/procedures/historico_multiple.sql
 create mode 100644 db/versions/10932-azureEucalyptus/00-firstScript.sql

diff --git a/db/routines/vn2008/procedures/historico_absoluto.sql b/db/routines/vn2008/procedures/historico_absoluto.sql
deleted file mode 100644
index 1a7e1dbfa..000000000
--- a/db/routines/vn2008/procedures/historico_absoluto.sql
+++ /dev/null
@@ -1,91 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`historico_absoluto`(IN idART INT, IN wh INT, IN datfecha DATETIME)
-BEGIN
-
-	DECLARE inv_calculado INT;
-	DECLARE inv INT;
-	DECLARE today DATETIME;
-	DECLARE fecha_inv DATETIME;
-	
-	SET today = util.VN_CURDATE();
-
-	CREATE OR REPLACE TEMPORARY TABLE historico_pasado
-		SELECT *
-			FROM (
-				SELECT TR.landing Fecha,
-						C.Cantidad Entrada,
-						NULL Salida,
-						(TR.received != FALSE) OK,
-						P.Proveedor Alias,
-						E.Referencia Referencia,
-						E.Id_Entrada id,
-						TR.delivered F5
-					FROM Compres C -- mirar perque no entra en received
-						INNER JOIN Entradas E USING (Id_Entrada)
-						INNER JOIN travel TR ON TR.id = E.travel_id
-						INNER JOIN Proveedores P USING (Id_Proveedor)
-					WHERE TR.landing >= '2001-01-01'
-						AND Id_proveedor <> 4
-						AND wh IN (TR.warehouse_id , 0)
-						AND C.Id_Article = idART
-						AND E.Inventario = 0
-						AND E.Redada = 0
-				UNION ALL
-				SELECT TR.shipment Fecha,
-						NULL Entrada,
-						C.Cantidad Salida,
-						TR.delivered OK,
-						P.Proveedor Alias,
-						E.Referencia Referencia,
-						E.Id_Entrada id,
-						TR.delivered F5
-					FROM Compres C
-						INNER JOIN Entradas E USING (Id_Entrada)
-						INNER JOIN travel TR ON TR.id = E.travel_id
-						INNER JOIN Proveedores P USING (Id_Proveedor)
-					WHERE TR.shipment >= '2001-01-01'
-						AND wh = TR.warehouse_id_out
-						AND Id_Proveedor <> 4
-						AND C.Id_Article = idART
-						AND E.Inventario = 0
-						AND E.Redada = 0
-				UNION ALL
-				SELECT T.Fecha Fecha,
-						NULL Entrada,
-						M.Cantidad Salida,
-						(M.OK <> 0 OR T.Etiquetasemitidas <> 0 OR T.Factura IS NOT NULL) OK,
-						T.Alias Alias,
-						T.Factura Referencia,
-						T.Id_Ticket,
-						T.PedidoImpreso
-					FROM Movimientos M
-						INNER JOIN Tickets T USING (Id_Ticket)
-						JOIN Clientes C ON C.Id_Cliente = T.Id_Cliente
-					WHERE T.Fecha >= '2001-01-01'
-						AND M.Id_Article = idART
-						AND wh IN (T.warehouse_id , 0)
-			) t1 
-			ORDER BY Fecha, Entrada DESC, OK DESC;
-
-	SELECT sum(Entrada) - sum(Salida) INTO inv_calculado
-		FROM historico_pasado
-			WHERE Fecha < datfecha;
-
-	SELECT p1.*, NULL v_virtual 
-		FROM(
-			SELECT datfecha Fecha,
-				inv_calculado Entrada,
-				NULL Salida,
-				1 OK,
-				'Inventario calculado' Alias,
-				'' Referencia, 0 id,
-				1 F5
-			UNION ALL
-			SELECT * 
-				FROM historico_pasado
-					WHERE Fecha >= datfecha
-			) p1;
-	
-	DROP TEMPORARY TABLE historico_pasado;
-END$$
-DELIMITER ;
diff --git a/db/routines/vn2008/procedures/historico_multiple.sql b/db/routines/vn2008/procedures/historico_multiple.sql
deleted file mode 100644
index ae4045a34..000000000
--- a/db/routines/vn2008/procedures/historico_multiple.sql
+++ /dev/null
@@ -1,206 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`historico_multiple`(IN vItemFk INT)
-BEGIN
-
-	DECLARE vDateInventory DATETIME;
-
-	SELECT Fechainventario INTO vDateInventory FROM tblContadores;
-
-	SET @a = 0;
-
-	DROP TEMPORARY TABLE IF EXISTS hm1;
-
-	CREATE TEMPORARY TABLE hm1
-	SELECT DATE(Fecha) as Fecha,
-		   Entrada,
-		   Salida,
-		   OK,
-		   Referencia,
-		   Historia.id,
-		   
-		   wh,
-		   
-		   `name` as wh_name
-
-	FROM
-
-		( SELECT TR.landing as Fecha,
-				 C.Cantidad as Entrada,
-				 NULL as Salida,
-				 
-				 IF(warehouse_id = 44, 1, warehouse_id) as wh,
-				 (TR.received != FALSE) as OK,
-				 E.Referencia as Referencia,
-				 E.Id_Entrada as id
-				 
-				
-
-		  FROM Compres C
-		  INNER JOIN Entradas E USING (Id_Entrada)
-		  INNER JOIN travel TR ON TR.id = E.travel_id
-		  WHERE TR.landing >= vDateInventory
-		  AND C.Id_Article = vItemFk
-		  AND E.Redada = 0
-		  
-		  AND C.Cantidad <> 0
-		  
-		UNION ALL
-
-		  SELECT TR.shipment as Fecha,
-				 NULL as Entrada,
-				 C.Cantidad as Salida,
-				 warehouse_id_out as wh,
-				 TR.delivered as OK,
-				 E.Referencia as Referencia,
-				 E.Id_Entrada as id
-
-		  FROM Compres C
-		  INNER JOIN Entradas E USING (Id_Entrada)
-		  INNER JOIN travel TR ON TR.id = E.travel_id
-		  WHERE TR.shipment >= vDateInventory
-		  AND C.Id_Article = vItemFk
-		  
-		  AND E.Redada = 0
-		  
-		  AND C.Cantidad <> 0
-
-		UNION ALL
-
-		  SELECT T.Fecha as Fecha,
-				 NULL as Entrada,
-				 M.Cantidad as Salida,
-				 warehouse_id as wh,
-				 (M.OK <> 0 OR T.Etiquetasemitidas <> 0 OR T.Factura IS NOT NULL)  as OK,
-				 T.Factura as Referencia,
-				 T.Id_Ticket as id
-
-			FROM Movimientos M
-			INNER JOIN Tickets T USING (Id_Ticket)
-			WHERE T.Fecha >= vDateInventory
-				AND M.Id_Article = vItemFk
-
-		 ) AS Historia
-		 
-		 INNER JOIN warehouse ON warehouse.id = Historia.wh
-	ORDER BY Fecha, Entrada DESC, OK DESC;
-
-
-	DROP TEMPORARY TABLE IF EXISTS hm2;
-	DROP TEMPORARY TABLE IF EXISTS hm3;
-	DROP TEMPORARY TABLE IF EXISTS hm4;
-	DROP TEMPORARY TABLE IF EXISTS hm5;
-	DROP TEMPORARY TABLE IF EXISTS hm6;
-	DROP TEMPORARY TABLE IF EXISTS hm7;
-	DROP TEMPORARY TABLE IF EXISTS hm8;
-	CREATE TEMPORARY TABLE hm2 SELECT * FROM hm1 WHERE wh = 19;
-	CREATE TEMPORARY TABLE hm3 SELECT * FROM hm1 WHERE wh = 7;
-	CREATE TEMPORARY TABLE hm4 SELECT * FROM hm1 WHERE wh = 60;
-	CREATE TEMPORARY TABLE hm5 SELECT * FROM hm1 WHERE wh = 5;
-	CREATE TEMPORARY TABLE hm6 SELECT * FROM hm1 WHERE wh = 17;
-	CREATE TEMPORARY TABLE hm7 SELECT * FROM hm1 WHERE wh = 37;
-	CREATE TEMPORARY TABLE hm8 SELECT * FROM hm1 WHERE wh = 55;
-
-	SELECT * FROM
-
-	(
-
-	SELECT Fecha, Entrada as BOGEntrada, Salida as BOGSalida, OK as BOGOK, Referencia as BOGReferencia, id as BOGid,
-
-		   NULL AS VNHEntrada, NULL AS VNHSalida, NULL AS VNHOK, NULL AS VNHReferencia, NULL AS VNHid,
-		   
-		   NULL AS ALGEntrada, NULL AS ALGSalida, NULL AS ALGOK, NULL AS ALGReferencia, NULL AS ALGid,
-		   
-		   NULL AS MADEntrada, NULL AS MADSalida, NULL AS MADOK, NULL AS MADReferencia, NULL AS MADid,
-		   
-		   NULL AS MCFEntrada, NULL AS MCFSalida, NULL AS MCFOK, NULL AS MCFReferencia, NULL AS MCFid,
-
-		   NULL AS VILEntrada, NULL AS VILSalida, NULL AS VILOK, NULL AS VILReferencia, NULL AS VILid,
-		   
-		   NULL AS BAREntrada, NULL AS BARSalida, NULL AS BAROK, NULL AS BARReferencia, NULL AS BARid
-
-	FROM hm2 
-
-
-	UNION ALL
-
-	SELECT Fecha
-		 , NULL, NULL, NULL, NULL, NULL
-		 ,Entrada, Salida, OK, Referencia, id
-		 , NULL, NULL, NULL, NULL, NULL
-		 , NULL, NULL, NULL, NULL, NULL
-		 , NULL, NULL, NULL, NULL, NULL
-		 , NULL, NULL, NULL, NULL, NULL
-		 , NULL, NULL, NULL, NULL, NULL
-	FROM hm3
-
-
-
-	UNION ALL
-
-	SELECT Fecha
-		 , NULL, NULL, NULL, NULL, NULL
-		 , NULL, NULL, NULL, NULL, NULL
-		 ,  Entrada, Salida, OK, Referencia, id
-		 , NULL, NULL, NULL, NULL, NULL
-		 , NULL, NULL, NULL, NULL, NULL
-		 , NULL, NULL, NULL, NULL, NULL
-		 , NULL, NULL, NULL, NULL, NULL
-	FROM hm4
-
-	UNION ALL
-
-	SELECT Fecha
-		 , NULL, NULL, NULL, NULL, NULL
-		 , NULL, NULL, NULL, NULL, NULL
-		 , NULL, NULL, NULL, NULL, NULL
-		 ,  Entrada, Salida, OK, Referencia, id
-		 , NULL, NULL, NULL, NULL, NULL
-		 , NULL, NULL, NULL, NULL, NULL
-		 , NULL, NULL, NULL, NULL, NULL
-	FROM hm5
-
-	UNION ALL
-
-	SELECT Fecha
-		 , NULL, NULL, NULL, NULL, NULL
-		 , NULL, NULL, NULL, NULL, NULL
-		 , NULL, NULL, NULL, NULL, NULL
-		 , NULL, NULL, NULL, NULL, NULL
-		 ,  Entrada, Salida, OK, Referencia, id
-		, NULL, NULL, NULL, NULL, NULL
-		, NULL, NULL, NULL, NULL, NULL
-	FROM hm6
-
-	UNION ALL
-
-	SELECT Fecha
-		, NULL, NULL, NULL, NULL, NULL
-		, NULL, NULL, NULL, NULL, NULL
-		, NULL, NULL, NULL, NULL, NULL
-		, NULL, NULL, NULL, NULL, NULL
-		, NULL, NULL, NULL, NULL, NULL
-		,  Entrada, Salida, OK, Referencia, id
-		, NULL, NULL, NULL, NULL, NULL
-		
-		 
-	FROM hm7
-
-	UNION ALL
-
-	SELECT Fecha
-		, NULL, NULL, NULL, NULL, NULL
-		, NULL, NULL, NULL, NULL, NULL
-		, NULL, NULL, NULL, NULL, NULL
-		, NULL, NULL, NULL, NULL, NULL
-		, NULL, NULL, NULL, NULL, NULL
-		, NULL, NULL, NULL, NULL, NULL
-		,  Entrada, Salida, OK, Referencia, id
-		 
-	FROM hm8
-
-	) sub
-
-	ORDER BY Fecha, BOGEntrada IS NULL, VNHEntrada IS NULL, ALGEntrada IS NULL, MADEntrada IS NULL, MCFEntrada IS NULL, VILEntrada IS NULL, BAREntrada IS NULL;
-
-END$$
-DELIMITER ;
diff --git a/db/versions/10932-azureEucalyptus/00-firstScript.sql b/db/versions/10932-azureEucalyptus/00-firstScript.sql
new file mode 100644
index 000000000..55eea3211
--- /dev/null
+++ b/db/versions/10932-azureEucalyptus/00-firstScript.sql
@@ -0,0 +1,2 @@
+GRANT EXECUTE ON PROCEDURE vn.absoluteInventoryHistory TO buyer;
+GRANT EXECUTE ON PROCEDURE vn.multipleInventoryHistory TO buyer;

From 354ecfaa1684d1f17db20d092ce9821a849219d9 Mon Sep 17 00:00:00 2001
From: ivanm <ivanm@verdnatura.es>
Date: Wed, 6 Mar 2024 09:00:21 +0100
Subject: [PATCH 04/22] refs #6498 Arreglar grant y tabs

---
 .../procedures/absoluteInventoryHistory.sql   |   4 +-
 .../procedures/multipleInventoryHistory.sql   | 206 +++++++++---------
 .../10932-azureEucalyptus/00-firstScript.sql  |  20 ++
 3 files changed, 125 insertions(+), 105 deletions(-)

diff --git a/db/routines/vn/procedures/absoluteInventoryHistory.sql b/db/routines/vn/procedures/absoluteInventoryHistory.sql
index f1a317598..a1e143185 100644
--- a/db/routines/vn/procedures/absoluteInventoryHistory.sql
+++ b/db/routines/vn/procedures/absoluteInventoryHistory.sql
@@ -1,6 +1,6 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`absoluteInventoryHistory`(
-    vItemFk INT, vWarehouse INT, vDate DATETIME)
+	vItemFk INT, vWarehouse INT, vDate DATETIME)
 BEGIN
 /**
 * Calcula y proporciona un historial de inventario absoluto
@@ -72,7 +72,7 @@ BEGIN
 					WHERE t.shipped >= '2001-01-01'
 						AND m.itemFk = vItemFk
 						AND vWarehouse IN (t.warehouseFk , 0)
-			) t1 
+			) t1
 			ORDER BY `date`, input DESC, ok DESC;
 
 	SELECT sum(input) - sum(`output`) INTO vCalculatedInventory
diff --git a/db/routines/vn/procedures/multipleInventoryHistory.sql b/db/routines/vn/procedures/multipleInventoryHistory.sql
index bd399e889..b15cab549 100644
--- a/db/routines/vn/procedures/multipleInventoryHistory.sql
+++ b/db/routines/vn/procedures/multipleInventoryHistory.sql
@@ -1,6 +1,6 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`multipleInventoryHistory`(
-    vItemFk INT)
+	vItemFk INT)
 BEGIN
 /**
 * Calcula y proporciona un historial de inventario detallado
@@ -17,58 +17,58 @@ BEGIN
 
 	CREATE TEMPORARY TABLE tMultipleHistory1
 	SELECT DATE(`date`) `date`,
-	    input,
+		input,
 		`output`,
 		ok,
 		reference,
 		history.id,
 		warehouse,
 		`name` warehouseName
-	    FROM ( 
-            SELECT tr.landed `date`,
+		FROM ( 
+			SELECT tr.landed `date`,
 				c.quantity input,
 				NULL `output`,
 				IF(warehouseInFk = 44, 1, warehouseInFk) warehouse,
 				(tr.isReceived <> FALSE) ok,
 				e.invoiceNumber reference,
-				e.id id	 
-		        FROM buy c
-                    JOIN `entry` e ON e.id = c.entryFk
-		            JOIN travel tr ON tr.id = e.travelFk
-		        WHERE tr.landed >= vDateInventory
-		            AND c.itemFk = vItemFk
-		            AND NOT e.isRaid
-		            AND c.quantity <> 0  
-		    UNION ALL
-		    SELECT tr.shipped `date`,
+				e.id id
+				FROM buy c
+					JOIN `entry` e ON e.id = c.entryFk
+					JOIN travel tr ON tr.id = e.travelFk
+				WHERE tr.landed >= vDateInventory
+					AND c.itemFk = vItemFk
+					AND NOT e.isRaid
+					AND c.quantity <> 0
+			UNION ALL
+			SELECT tr.shipped `date`,
 				NULL input,
 				c.quantity `output`,
-				warehouseOutFk warehouse,
+				tr.warehouseOutFk warehouse,
 				tr.isDelivered ok,
 				e.invoiceNumber reference,
 				e.id id
-		        FROM buy c
-                    JOIN `entry` e ON e.id = c.entryFk
-		            JOIN travel tr ON tr.id = e.travelFk
-		        WHERE tr.shipped >= vDateInventory
-		            AND c.itemFk = vItemFk
-		            AND NOT e.isRaid
-		            AND c.quantity <> 0
-            UNION ALL
-            SELECT t.shipped `date`,
+				FROM buy c
+					JOIN `entry` e ON e.id = c.entryFk
+					JOIN travel tr ON tr.id = e.travelFk
+				WHERE tr.shipped >= vDateInventory
+					AND c.itemFk = vItemFk
+					AND NOT e.isRaid
+					AND c.quantity <> 0
+			UNION ALL
+			SELECT t.shipped `date`,
 				NULL input,
 				m.quantity `output`,
-				warehouseInFk warehouse,
+				tr.warehouseInFk warehouse,
 				(m.isPicked <> 0 OR t.isLabeled <> 0 OR t.refFk IS NOT NULL) ok,
 				t.refFk reference,
 				t.id id
-			    FROM sale m
-                    JOIN ticket t ON t.id = m.ticketFk
-			    WHERE t.shipped >= vDateInventory
-				    AND m.itemFk = vItemFk
-		 ) history
-		    JOIN warehouse ON warehouse.id = history.warehouse
-	        ORDER BY `date`, input DESC, ok DESC;
+				FROM sale m
+					JOIN ticket t ON t.id = m.ticketFk
+				WHERE t.shipped >= vDateInventory
+					AND m.itemFk = vItemFk
+			) history
+			JOIN warehouse ON warehouse.id = history.warehouse
+			ORDER BY `date`, input DESC, ok DESC;
 
 	DROP TEMPORARY TABLE IF EXISTS tMultipleHistory2;
 	DROP TEMPORARY TABLE IF EXISTS tMultipleHistory3;
@@ -86,76 +86,76 @@ BEGIN
 	CREATE TEMPORARY TABLE tMultipleHistory8 SELECT * FROM tMultipleHistory1 WHERE warehouse = 55;
 
 	SELECT *
-        FROM (
-            SELECT `date`, input BOGinput, `output` BOGoutput, ok BOGok, reference BOGreference, id BOGid,
-            NULL VNHinput, NULL VNHoutput, NULL VNHok, NULL VNHreference, NULL VNHid,
-            NULL ALGinput, NULL ALGoutput, NULL ALGok, NULL ALGreference, NULL ALGid,
-            NULL MADinput, NULL MADoutput, NULL MADok, NULL MADreference, NULL MADid,
-            NULL MCFinput, NULL MCFoutput, NULL MCFok, NULL MCFreference, NULL MCFid,
-            NULL VILinput, NULL VILoutput, NULL VILok, NULL VILreference, NULL VILid,
-            NULL BARinput, NULL BARoutput, NULL BARok, NULL BARreference, NULL BARid
-                FROM tMultipleHistory2 
-            UNION ALL
-            SELECT `date`,
-            NULL, NULL, NULL, NULL, NULL,
-            input, `output`, ok, reference, id,
-            NULL, NULL, NULL, NULL, NULL,
-            NULL, NULL, NULL, NULL, NULL,
-            NULL, NULL, NULL, NULL, NULL,
-            NULL, NULL, NULL, NULL, NULL,
-            NULL, NULL, NULL, NULL, NULL
-	            FROM tMultipleHistory3
-            UNION ALL
-            SELECT `date`,
-            NULL, NULL, NULL, NULL, NULL,
-            NULL, NULL, NULL, NULL, NULL,
-            input, `output`, ok, reference, id,
-            NULL, NULL, NULL, NULL, NULL,
-            NULL, NULL, NULL, NULL, NULL,
-            NULL, NULL, NULL, NULL, NULL,
-            NULL, NULL, NULL, NULL, NULL
-	            FROM tMultipleHistory4
-            UNION ALL
-            SELECT `date`,
-            NULL, NULL, NULL, NULL, NULL,
-            NULL, NULL, NULL, NULL, NULL,
-            NULL, NULL, NULL, NULL, NULL,
-            input, `output`, ok, reference, id,
-            NULL, NULL, NULL, NULL, NULL,
-            NULL, NULL, NULL, NULL, NULL,
-            NULL, NULL, NULL, NULL, NULL
-	            FROM tMultipleHistory5
-            UNION ALL
-            SELECT `date`,
-            NULL, NULL, NULL, NULL, NULL,
-            NULL, NULL, NULL, NULL, NULL,
-            NULL, NULL, NULL, NULL, NULL,
-            NULL, NULL, NULL, NULL, NULL,
-            input, `output`, ok, reference, id,
-            NULL, NULL, NULL, NULL, NULL,
-            NULL, NULL, NULL, NULL, NULL
-                FROM tMultipleHistory6
-            UNION ALL
-            SELECT `date`,
-            NULL, NULL, NULL, NULL, NULL,
-            NULL, NULL, NULL, NULL, NULL,
-            NULL, NULL, NULL, NULL, NULL,
-            NULL, NULL, NULL, NULL, NULL,
-            NULL, NULL, NULL, NULL, NULL,
-            input, `output`, ok, reference, id,
-            NULL, NULL, NULL, NULL, NULL
-                FROM tMultipleHistory7
-            UNION ALL
-            SELECT `date`,
-            NULL, NULL, NULL, NULL, NULL,
-            NULL, NULL, NULL, NULL, NULL,
-            NULL, NULL, NULL, NULL, NULL,
-            NULL, NULL, NULL, NULL, NULL,
-            NULL, NULL, NULL, NULL, NULL,
-            NULL, NULL, NULL, NULL, NULL,
-            input, `output`, ok, reference, id
-		        FROM tMultipleHistory8
-        ) sub
-        ORDER BY `date`, BOGinput IS NULL, VNHinput IS NULL, ALGinput IS NULL, MADinput IS NULL, MCFinput IS NULL, VILinput IS NULL, BARinput IS NULL;
+		FROM (
+			SELECT `date`, input BOGinput, `output` BOGoutput, ok BOGok, reference BOGreference, id BOGid,
+			NULL VNHinput, NULL VNHoutput, NULL VNHok, NULL VNHreference, NULL VNHid,
+			NULL ALGinput, NULL ALGoutput, NULL ALGok, NULL ALGreference, NULL ALGid,
+			NULL MADinput, NULL MADoutput, NULL MADok, NULL MADreference, NULL MADid,
+			NULL MCFinput, NULL MCFoutput, NULL MCFok, NULL MCFreference, NULL MCFid,
+			NULL VILinput, NULL VILoutput, NULL VILok, NULL VILreference, NULL VILid,
+			NULL BARinput, NULL BARoutput, NULL BARok, NULL BARreference, NULL BARid
+				FROM tMultipleHistory2
+			UNION ALL
+			SELECT `date`,
+			NULL, NULL, NULL, NULL, NULL,
+			input, `output`, ok, reference, id,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL
+				FROM tMultipleHistory3
+			UNION ALL
+			SELECT `date`,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			input, `output`, ok, reference, id,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL
+				FROM tMultipleHistory4
+			UNION ALL
+			SELECT `date`,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			input, `output`, ok, reference, id,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL
+				FROM tMultipleHistory5
+			UNION ALL
+			SELECT `date`,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			input, `output`, ok, reference, id,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL
+				FROM tMultipleHistory6
+			UNION ALL
+			SELECT `date`,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			input, `output`, ok, reference, id,
+			NULL, NULL, NULL, NULL, NULL
+				FROM tMultipleHistory7
+			UNION ALL
+			SELECT `date`,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			NULL, NULL, NULL, NULL, NULL,
+			input, `output`, ok, reference, id
+				FROM tMultipleHistory8
+		) sub
+		ORDER BY `date`, BOGinput IS NULL, VNHinput IS NULL, ALGinput IS NULL, MADinput IS NULL, MCFinput IS NULL, VILinput IS NULL, BARinput IS NULL;
 END$$
 DELIMITER ;
\ No newline at end of file
diff --git a/db/versions/10932-azureEucalyptus/00-firstScript.sql b/db/versions/10932-azureEucalyptus/00-firstScript.sql
index 55eea3211..399819cc4 100644
--- a/db/versions/10932-azureEucalyptus/00-firstScript.sql
+++ b/db/versions/10932-azureEucalyptus/00-firstScript.sql
@@ -1,2 +1,22 @@
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`multipleInventoryHistory`(
+	vItemFk INT)
+BEGIN
+	DECLARE vDateInventory DATETIME;
+	SELECT inventoried INTO vDateInventory FROM config;
+
+END$$
+DELIMITER ;
+
+DELIMITER $$
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`absoluteInventoryHistory`(
+	vItemFk INT, vWarehouse INT, vDate DATETIME)
+BEGIN
+	DECLARE vCalculatedInventory INT;
+	SET vCalculatedInventory = 0;
+
+END$$
+DELIMITER ;
+
 GRANT EXECUTE ON PROCEDURE vn.absoluteInventoryHistory TO buyer;
 GRANT EXECUTE ON PROCEDURE vn.multipleInventoryHistory TO buyer;

From 7947d6644e5de63988e8845185b7d968efb997ca Mon Sep 17 00:00:00 2001
From: ivanm <ivanm@verdnatura.es>
Date: Wed, 6 Mar 2024 12:44:59 +0100
Subject: [PATCH 05/22] refs #6498 Correcion errores

---
 .../procedures/absoluteInventoryHistory.sql   | 25 ++++++++++---------
 .../procedures/multipleInventoryHistory.sql   | 24 ++++++++----------
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/db/routines/vn/procedures/absoluteInventoryHistory.sql b/db/routines/vn/procedures/absoluteInventoryHistory.sql
index a1e143185..7dce6e252 100644
--- a/db/routines/vn/procedures/absoluteInventoryHistory.sql
+++ b/db/routines/vn/procedures/absoluteInventoryHistory.sql
@@ -1,6 +1,9 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`absoluteInventoryHistory`(
-	vItemFk INT, vWarehouse INT, vDate DATETIME)
+	vItemFk INT,
+	vWarehouseFk INT,
+	vDate DATETIME
+)
 BEGIN
 /**
 * Calcula y proporciona un historial de inventario absoluto
@@ -8,13 +11,11 @@ BEGIN
 * hasta una fecha determinada.
 *
 * @param vItemFk Id de artículo
-* @param vWarehouse Almacén
+* @param vWarehouseFk Id de almacén
 * @param vDate Fecha
 */
 	DECLARE vCalculatedInventory INT;
-	DECLARE vToday DATETIME;
-	
-	SET vToday = util.VN_CURDATE();
+	DECLARE vToday DATETIME DEFAULT util.VN_CURDATE();
 
 	CREATE OR REPLACE TEMPORARY TABLE tHistoricalPast
 		ENGINE = MEMORY
@@ -23,7 +24,7 @@ BEGIN
 				SELECT tr.landed `date`,
 						b.quantity input,
 						NULL `output`,
-						(tr.isReceived != FALSE) ok,
+						tr.isReceived ok,
 						s.name alias,
 						e.invoiceNumber reference,
 						e.id id,
@@ -34,7 +35,7 @@ BEGIN
 						JOIN supplier s ON s.id = e.supplierFk
 					WHERE tr.landed >= '2001-01-01'
 						AND s.id <> 4
-						AND vWarehouse IN (tr.warehouseInFk, 0)
+						AND vWarehouseFk IN (tr.warehouseInFk, 0)
 						AND b.itemFk = vItemFk
 						AND NOT e.isExcludedFromAvailable
 						AND NOT e.isRaid
@@ -52,7 +53,7 @@ BEGIN
 						JOIN travel tr ON tr.id = e.travelFk
 						JOIN supplier s ON s.id = e.supplierFk
 					WHERE tr.shipped >= '2001-01-01'
-						AND vWarehouse = tr.warehouseOutFk
+						AND vWarehouseFk = tr.warehouseOutFk
 						AND s.id <> 4
 						AND b.itemFk = vItemFk
 						AND NOT e.isExcludedFromAvailable
@@ -61,7 +62,7 @@ BEGIN
 				SELECT t.shipped `date`,
 						NULL input,
 						m.quantity `output`,
-						(m.isPicked <> 0 OR t.isLabeled <> 0 OR t.refFk IS NOT NULL) ok,
+						(m.isPicked OR t.isLabeled OR t.refFk IS NOT NULL) ok,
 						t.nickname alias,
 						t.refFk reference,
 						t.id,
@@ -71,16 +72,16 @@ BEGIN
 						JOIN client c ON c.id = t.clientFk
 					WHERE t.shipped >= '2001-01-01'
 						AND m.itemFk = vItemFk
-						AND vWarehouse IN (t.warehouseFk , 0)
+						AND vWarehouseFk IN (t.warehouseFk , 0)
 			) t1
 			ORDER BY `date`, input DESC, ok DESC;
 
-	SELECT sum(input) - sum(`output`) INTO vCalculatedInventory
+	SELECT SUM(input) - SUM(`output`) INTO vCalculatedInventory
 		FROM tHistoricalPast
 			WHERE `date` < vDate;
 
 	SELECT p1.*, NULL v_virtual 
-		FROM(
+		FROM (
 			SELECT vDate `date`,
 				vCalculatedInventory input,
 				NULL `output`,
diff --git a/db/routines/vn/procedures/multipleInventoryHistory.sql b/db/routines/vn/procedures/multipleInventoryHistory.sql
index b15cab549..ec151a6ff 100644
--- a/db/routines/vn/procedures/multipleInventoryHistory.sql
+++ b/db/routines/vn/procedures/multipleInventoryHistory.sql
@@ -29,16 +29,16 @@ BEGIN
 				c.quantity input,
 				NULL `output`,
 				IF(warehouseInFk = 44, 1, warehouseInFk) warehouse,
-				(tr.isReceived <> FALSE) ok,
+				tr.isReceived ok,
 				e.invoiceNumber reference,
-				e.id id
+				e.id
 				FROM buy c
 					JOIN `entry` e ON e.id = c.entryFk
 					JOIN travel tr ON tr.id = e.travelFk
 				WHERE tr.landed >= vDateInventory
 					AND c.itemFk = vItemFk
 					AND NOT e.isRaid
-					AND c.quantity <> 0
+					AND c.quantity
 			UNION ALL
 			SELECT tr.shipped `date`,
 				NULL input,
@@ -46,20 +46,20 @@ BEGIN
 				tr.warehouseOutFk warehouse,
 				tr.isDelivered ok,
 				e.invoiceNumber reference,
-				e.id id
+				e.id
 				FROM buy c
 					JOIN `entry` e ON e.id = c.entryFk
 					JOIN travel tr ON tr.id = e.travelFk
 				WHERE tr.shipped >= vDateInventory
 					AND c.itemFk = vItemFk
 					AND NOT e.isRaid
-					AND c.quantity <> 0
+					AND c.quantity
 			UNION ALL
 			SELECT t.shipped `date`,
 				NULL input,
 				m.quantity `output`,
 				tr.warehouseInFk warehouse,
-				(m.isPicked <> 0 OR t.isLabeled <> 0 OR t.refFk IS NOT NULL) ok,
+				(m.isPicked OR t.isLabeled OR t.refFk IS NOT NULL) ok,
 				t.refFk reference,
 				t.id id
 				FROM sale m
@@ -70,13 +70,8 @@ BEGIN
 			JOIN warehouse ON warehouse.id = history.warehouse
 			ORDER BY `date`, input DESC, ok DESC;
 
-	DROP TEMPORARY TABLE IF EXISTS tMultipleHistory2;
-	DROP TEMPORARY TABLE IF EXISTS tMultipleHistory3;
-	DROP TEMPORARY TABLE IF EXISTS tMultipleHistory4;
-	DROP TEMPORARY TABLE IF EXISTS tMultipleHistory5;
-	DROP TEMPORARY TABLE IF EXISTS tMultipleHistory6;
-	DROP TEMPORARY TABLE IF EXISTS tMultipleHistory7;
-	DROP TEMPORARY TABLE IF EXISTS tMultipleHistory8;
+	DROP TEMPORARY TABLE IF EXISTS tMultipleHistory2, tMultipleHistory3,
+		tMultipleHistory4, tMultipleHistory5, tMultipleHistory6, tMultipleHistory7, tMultipleHistory8;
 	CREATE TEMPORARY TABLE tMultipleHistory2 SELECT * FROM tMultipleHistory1 WHERE warehouse = 19;
 	CREATE TEMPORARY TABLE tMultipleHistory3 SELECT * FROM tMultipleHistory1 WHERE warehouse = 7;
 	CREATE TEMPORARY TABLE tMultipleHistory4 SELECT * FROM tMultipleHistory1 WHERE warehouse = 60;
@@ -156,6 +151,7 @@ BEGIN
 			input, `output`, ok, reference, id
 				FROM tMultipleHistory8
 		) sub
-		ORDER BY `date`, BOGinput IS NULL, VNHinput IS NULL, ALGinput IS NULL, MADinput IS NULL, MCFinput IS NULL, VILinput IS NULL, BARinput IS NULL;
+		ORDER BY `date`, BOGinput IS NULL, VNHinput IS NULL, ALGinput IS NULL,
+			MADinput IS NULL, MCFinput IS NULL, VILinput IS NULL, BARinput IS NULL;
 END$$
 DELIMITER ;
\ No newline at end of file

From 6b2533cfb122ddd832ae9c6a447fe5bbac8b96fa Mon Sep 17 00:00:00 2001
From: ivanm <ivanm@verdnatura.es>
Date: Wed, 6 Mar 2024 15:16:55 +0100
Subject: [PATCH 06/22] refs #6498 correccion errores 2

---
 .../procedures/absoluteInventoryHistory.sql   | 41 ++++++++++---------
 .../procedures/multipleInventoryHistory.sql   | 31 +++++++-------
 2 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/db/routines/vn/procedures/absoluteInventoryHistory.sql b/db/routines/vn/procedures/absoluteInventoryHistory.sql
index 7dce6e252..627b7c8be 100644
--- a/db/routines/vn/procedures/absoluteInventoryHistory.sql
+++ b/db/routines/vn/procedures/absoluteInventoryHistory.sql
@@ -16,6 +16,7 @@ BEGIN
 */
 	DECLARE vCalculatedInventory INT;
 	DECLARE vToday DATETIME DEFAULT util.VN_CURDATE();
+	DECLARE vStartDate DATE DEFAULT '2001-01-01';
 
 	CREATE OR REPLACE TEMPORARY TABLE tHistoricalPast
 		ENGINE = MEMORY
@@ -33,46 +34,46 @@ BEGIN
 						JOIN `entry` e ON e.id = b.entryFk
 						JOIN travel tr ON tr.id = e.travelFk
 						JOIN supplier s ON s.id = e.supplierFk
-					WHERE tr.landed >= '2001-01-01'
-						AND s.id <> 4
+					WHERE tr.landed >= vStartDate
+						AND s.id <> (SELECT supplierFk FROM inventoryConfig)
 						AND vWarehouseFk IN (tr.warehouseInFk, 0)
 						AND b.itemFk = vItemFk
 						AND NOT e.isExcludedFromAvailable
 						AND NOT e.isRaid
 				UNION ALL
-				SELECT tr.shipped `date`,
-						NULL input,
-						b.quantity `output`,
-						tr.isDelivered ok,
-						s.name alias,
-						e.invoiceNumber reference,
-						e.id id,
-						tr.isDelivered f5
+				SELECT tr.shipped,
+						NULL,
+						b.quantity,
+						tr.isDelivered,
+						s.name,
+						e.invoiceNumber,
+						e.id,
+						tr.isDelivered
 					FROM buy b
 						JOIN `entry` e ON e.id = b.entryFk
 						JOIN travel tr ON tr.id = e.travelFk
 						JOIN supplier s ON s.id = e.supplierFk
-					WHERE tr.shipped >= '2001-01-01'
+					WHERE tr.shipped >= vStartDate
 						AND vWarehouseFk = tr.warehouseOutFk
-						AND s.id <> 4
+						AND s.id <> (SELECT supplierFk FROM inventoryConfig)
 						AND b.itemFk = vItemFk
 						AND NOT e.isExcludedFromAvailable
 						AND NOT e.isRaid
 				UNION ALL
-				SELECT t.shipped `date`,
-						NULL input,
-						m.quantity `output`,
-						(m.isPicked OR t.isLabeled OR t.refFk IS NOT NULL) ok,
-						t.nickname alias,
-						t.refFk reference,
+				SELECT t.shipped,
+						NULL,
+						m.quantity,
+						(m.isPicked OR t.isLabeled OR t.refFk IS NOT NULL),
+						t.nickname,
+						t.refFk,
 						t.id,
 						t.isPrinted
 					FROM sale m
 						JOIN ticket t ON t.id = m.ticketFk
 						JOIN client c ON c.id = t.clientFk
-					WHERE t.shipped >= '2001-01-01'
+					WHERE t.shipped >= vStartDate
 						AND m.itemFk = vItemFk
-						AND vWarehouseFk IN (t.warehouseFk , 0)
+						AND vWarehouseFk IN (t.warehouseFk, 0)
 			) t1
 			ORDER BY `date`, input DESC, ok DESC;
 
diff --git a/db/routines/vn/procedures/multipleInventoryHistory.sql b/db/routines/vn/procedures/multipleInventoryHistory.sql
index ec151a6ff..dc19e615a 100644
--- a/db/routines/vn/procedures/multipleInventoryHistory.sql
+++ b/db/routines/vn/procedures/multipleInventoryHistory.sql
@@ -1,6 +1,7 @@
 DELIMITER $$
 CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`multipleInventoryHistory`(
-	vItemFk INT)
+	vItemFk INT
+)
 BEGIN
 /**
 * Calcula y proporciona un historial de inventario detallado
@@ -28,7 +29,7 @@ BEGIN
 			SELECT tr.landed `date`,
 				c.quantity input,
 				NULL `output`,
-				IF(warehouseInFk = 44, 1, warehouseInFk) warehouse,
+				tr.warehouseInFk warehouse,
 				tr.isReceived ok,
 				e.invoiceNumber reference,
 				e.id
@@ -40,12 +41,12 @@ BEGIN
 					AND NOT e.isRaid
 					AND c.quantity
 			UNION ALL
-			SELECT tr.shipped `date`,
-				NULL input,
-				c.quantity `output`,
-				tr.warehouseOutFk warehouse,
-				tr.isDelivered ok,
-				e.invoiceNumber reference,
+			SELECT tr.shipped,
+				NULL,
+				c.quantity,
+				tr.warehouseOutFk,
+				tr.isDelivered,
+				e.invoiceNumber,
 				e.id
 				FROM buy c
 					JOIN `entry` e ON e.id = c.entryFk
@@ -55,13 +56,13 @@ BEGIN
 					AND NOT e.isRaid
 					AND c.quantity
 			UNION ALL
-			SELECT t.shipped `date`,
-				NULL input,
-				m.quantity `output`,
-				tr.warehouseInFk warehouse,
-				(m.isPicked OR t.isLabeled OR t.refFk IS NOT NULL) ok,
-				t.refFk reference,
-				t.id id
+			SELECT t.shipped,
+				NULL,
+				m.quantity,
+				t.warehouseFk,
+				(m.isPicked OR t.isLabeled OR t.refFk IS NOT NULL),
+				t.refFk,
+				t.id
 				FROM sale m
 					JOIN ticket t ON t.id = m.ticketFk
 				WHERE t.shipped >= vDateInventory

From fbeb9b058d4ca6367b4e003142b29c4ec09ffb5c Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Thu, 14 Mar 2024 09:34:37 +0100
Subject: [PATCH 07/22] hotfix: itemProposal added optimizer_search_depth

---
 db/routines/vn/procedures/itemProposal.sql | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/db/routines/vn/procedures/itemProposal.sql b/db/routines/vn/procedures/itemProposal.sql
index 0dc04124d..da9e757aa 100644
--- a/db/routines/vn/procedures/itemProposal.sql
+++ b/db/routines/vn/procedures/itemProposal.sql
@@ -18,21 +18,17 @@ BEGIN
 	DECLARE vCalcFk INT;
 	DECLARE vTypeFk INT;
 	DECLARE vPriority INT DEFAULT 1;
-	DECLARE EXIT HANDLER FOR SQLEXCEPTION
-	BEGIN
-		ROLLBACK;
-		RESIGNAL;
-	END;
 
 	SELECT warehouseFk, shipped
 		INTO vWarehouseFk, vShipped
 		FROM ticket
 		WHERE id = vTicketFk;
 
-	START TRANSACTION;
-
 	CALL cache.available_refresh(vCalcFk, FALSE, vWarehouseFk, vShipped);
 
+	SET @_optimizer_search_depth = @@optimizer_search_depth;
+	SET SESSION optimizer_search_depth = 0;
+
 	WITH itemTags AS (
 		SELECT i.id,
 				typeFk,
@@ -99,6 +95,7 @@ BEGIN
 			match7 DESC,
 			(i.tag8 = its.tag8) DESC,
 			match8 DESC;
-	COMMIT;
+
+	SET SESSION optimizer_search_depth = @_optimizer_search_depth;
 END$$
 DELIMITER ;

From 160d72e755ec57372d9b29601910c084f0de19ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= <carlosap@verdnatura.es>
Date: Thu, 14 Mar 2024 17:02:07 +0100
Subject: [PATCH 08/22] hotfix upload invoiceIn_add.sql error

---
 db/routines/sage/procedures/invoiceIn_add.sql |  96 ++++---
 db/routines/vn/procedures/invoiceIn_add.sql   | 234 ------------------
 2 files changed, 64 insertions(+), 266 deletions(-)
 delete mode 100644 db/routines/vn/procedures/invoiceIn_add.sql

diff --git a/db/routines/sage/procedures/invoiceIn_add.sql b/db/routines/sage/procedures/invoiceIn_add.sql
index a2690deb0..0898d6810 100644
--- a/db/routines/sage/procedures/invoiceIn_add.sql
+++ b/db/routines/sage/procedures/invoiceIn_add.sql
@@ -3,10 +3,11 @@ CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `sage`.`invoiceIn_add`(vI
 BEGIN
 /**
  * Traslada la info de contabilidad relacionada con las facturas recibidas
- * 
+ *
  * @vInvoiceInFk Factura recibida
  * @vXDiarioFk Id tabla XDiario
- */	
+ */
+    DECLARE vInvoiceInOriginalFk INT;
 	DECLARE vDone BOOL DEFAULT FALSE;
 	DECLARE vBase DOUBLE;
 	DECLARE vVat DOUBLE;
@@ -23,25 +24,25 @@ BEGIN
 	DECLARE vInvoiceTypeInformative VARCHAR(1);
 	DECLARE vIsInformativeExportation BOOL DEFAULT FALSE;
 
-	DECLARE vCursor CURSOR FOR 
+	DECLARE vCursor CURSOR FOR
 		SELECT it.taxableBase,
 				CAST((( it.taxableBase / 100) * t.PorcentajeIva) AS DECIMAL (10,2)),
 				t.PorcentajeIva,
 				it.transactionTypeSageFk,
 				it.taxTypeSageFk,
 				tty.isIntracommunity,
-				tt.ClaveOperacionDefecto 
+				tt.ClaveOperacionDefecto
 			FROM vn.invoiceIn i
 				JOIN vn.invoiceInTax it ON it.InvoiceInFk = i.id
 				JOIN TiposIva t ON t.CodigoIva = it.taxTypeSageFk
 				JOIN taxType tty ON tty.id = t.CodigoIva
 				JOIN TiposTransacciones tt ON tt.CodigoTransaccion = it.transactionTypeSageFk
 				LEFT JOIN vn.dua d ON d.id = vInvoiceInFk
-			WHERE i.id = vInvoiceInFk 
+			WHERE i.id = vInvoiceInFk
 				AND d.id IS NULL;
-	
+
 	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-	
+
 	DELETE FROM movContaIVA
 		WHERE id = vXDiarioFk;
 
@@ -64,22 +65,22 @@ BEGIN
 				vTaxCode,
 				vIsIntracommunity,
 				vOperationCode;
-		
-		IF vDone THEN 
+
+		IF vDone THEN
 			LEAVE l;
 		END IF;
 
-		SET vTransactionCodeOld = vTransactionCode; 
-		SET vTaxCodeOld = vTaxCode; 
+		SET vTransactionCodeOld = vTransactionCode;
+		SET vTaxCodeOld = vTaxCode;
 
-		IF vOperationCode IS NOT NULL THEN 
+		IF vOperationCode IS NOT NULL THEN
 			UPDATE movContaIVA
 				SET ClaveOperacionFactura = vOperationCode
 				WHERE id = vXDiarioFk;
 		END IF;
-		
+
 		SET vCounter = vCounter + 1;
-		CASE vCounter 
+		CASE vCounter
 			WHEN 1 THEN
 				 UPDATE movContaIVA
 					SET BaseIva1 = vBase,
@@ -115,31 +116,31 @@ BEGIN
 					WHERE id = vXDiarioFk;
 			ELSE
 				SELECT vXDiarioFk INTO vXDiarioFk;
-		END CASE; 
+		END CASE;
 
 		IF vIsIntracommunity THEN
 			UPDATE movContaIVA
 				SET Intracomunitaria = TRUE
 				WHERE id = vXDiarioFk;
 		END IF;
-	
-		SET vTransactionCodeOld = vTransactionCode; 
-		SET vTaxCodeOld = vTaxCode; 		
-		
+
+		SET vTransactionCodeOld = vTransactionCode;
+		SET vTaxCodeOld = vTaxCode;
+
 	END LOOP;
 
 	CLOSE vCursor;
 
 	SELECT d.ASIEN AND x.ASIEN IS NULL INTO vIsInformativeExportation
 		FROM vn.dua d
-			LEFT JOIN vn.XDiario x ON x.ASIEN = d.ASIEN 
+			LEFT JOIN vn.XDiario x ON x.ASIEN = d.ASIEN
 				AND x.SERIE = vSerialDua COLLATE utf8mb3_unicode_ci
 		WHERE d.ASIEN = (
 			SELECT ASIEN
-				FROM vn.XDiario 
+				FROM vn.XDiario
 				WHERE id = vXDiarioFk)
 		LIMIT 1;
- 
+
 	UPDATE movContaIVA mci
 			JOIN tmp.invoiceIn ii ON ii.id = vInvoiceInFk
 			JOIN vn.XDiario x ON x.id = mci.id
@@ -151,13 +152,13 @@ BEGIN
 			mci.Serie = ii.serial,
 			mci.Factura = ii.id,
 			mci.FechaFactura = ii.issued,
-			mci.ImporteFactura = IFNULL(mci.BaseIva1, 0) + IFNULL(mci.CuotaIva1, 0) + 
-								IFNULL(mci.BaseIva2, 0) + IFNULL(mci.CuotaIva2, 0) + 
-								IFNULL(mci.BaseIva3, 0) + IFNULL(mci.CuotaIva3, 0) + 
+			mci.ImporteFactura = IFNULL(mci.BaseIva1, 0) + IFNULL(mci.CuotaIva1, 0) +
+								IFNULL(mci.BaseIva2, 0) + IFNULL(mci.CuotaIva2, 0) +
+								IFNULL(mci.BaseIva3, 0) + IFNULL(mci.CuotaIva3, 0) +
 								IFNULL(mci.BaseIva4, 0) + IFNULL(mci.CuotaIva4, 0),
-			mci.TipoFactura = IF(id.id, 
-				IF( ii.serial = vSerialDua COLLATE utf8mb3_unicode_ci, vInvoiceTypeReceived, vInvoiceTypeInformative), 
-				IF(vIsInformativeExportation,vInvoiceTypeInformative, vInvoiceTypeReceived)), 
+			mci.TipoFactura = IF(id.id,
+				IF( ii.serial = vSerialDua COLLATE utf8mb3_unicode_ci, vInvoiceTypeReceived, vInvoiceTypeInformative),
+				IF(vIsInformativeExportation,vInvoiceTypeInformative, vInvoiceTypeReceived)),
 			mci.CodigoCuentaFactura = x.SUBCTA,
 			mci.CifDni = IF(LEFT(TRIM(s.nif), 2) = n.SiglaNacion, SUBSTRING(TRIM(s.nif), 3), s.nif),
 			mci.Nombre = s.name,
@@ -185,7 +186,7 @@ BEGIN
 			JOIN (SELECT SUM(x2.BASEEURO) taxableBase, SUM(x2.EURODEBE) taxBase
 					FROM vn.XDiario x1
 						JOIN vn.XDiario x2 ON x1.ASIEN = x2.ASIEN
-					WHERE x2.BASEEURO <> 0 
+					WHERE x2.BASEEURO <> 0
 						AND x1.id = vXDiarioFk
 				)sub
 			JOIN ClavesOperacion co ON co.Descripcion = 'Arrendamiento de locales de negocio'
@@ -193,10 +194,41 @@ BEGIN
 			mci.ClaveOperacionFactura = IF( t.Retencion = 'ARRENDAMIENTO Y SUBARRENDAMIENTO', co.ClaveOperacionFactura_, mci.ClaveOperacionFactura),
 			mci.BaseRetencion = IF (t.Retencion = 'ACTIVIDADES AGRICOLAS O GANADERAS', sub.taxableBase + sub.taxBase, sub.taxableBase),
 			mci.PorRetencion = t.PorcentajeRetencion,
-			mci.ImporteRetencion = iit.taxableBase * - 1 
-		WHERE mci.id = vXDiarioFk 
+			mci.ImporteRetencion = iit.taxableBase * - 1
+		WHERE mci.id = vXDiarioFk
 			AND e.name = 'Retenciones'
 			AND id.id IS NULL;
 
+	SELECT correctedFk INTO vInvoiceInOriginalFk
+		FROM vn.invoiceInCorrection
+		WHERE correctingFk = vInvoiceInFk;
+
+	IF vInvoiceInOriginalFk THEN 
+
+		UPDATE movContaIVA mci
+				JOIN vn.invoiceInRefund iir ON iir.invoiceInRefundFk = vInvoiceInFk
+				JOIN (SELECT issued,
+							SUM(sub.taxableBase) taxableBase, 
+							SUM(ROUND((sub.taxableBase * sub.PorcentajeIva) / 100 , 2)) vat
+						FROM(SELECT issued,
+									SUM(iit.taxableBase) taxableBase, 
+									ti.PorcentajeIva
+								FROM vn.invoiceIn i 
+									JOIN vn.invoiceInTax iit ON iit.invoiceInFk = i.id
+									JOIN sage.TiposIva ti ON ti.CodigoIva = iit.taxTypeSageFk
+								WHERE i.id = vInvoiceInOriginalFk
+								GROUP BY ti.CodigoIva)sub
+					)invoiceInOriginal
+				JOIN ClavesOperacion co ON co.Descripcion = 'Factura rectificativa'
+			SET mci.TipoRectificativa = iir.refundCategoryFk,
+				mci.ClaseAbonoRectificativas = iir.refundType, 
+				mci.FechaFacturaOriginal = invoiceInOriginal.issued,
+				mci.FechaOperacion = invoiceInOriginal.issued,
+				mci.BaseImponibleOriginal = invoiceInOriginal.taxableBase,
+				mci.CuotaIvaOriginal = invoiceInOriginal.vat,
+				mci.ClaveOperacionFactura = co.ClaveOperacionFactura_
+			WHERE mci.id = vXDiarioFk;
+
+	END IF;
 END$$
-DELIMITER ;
+DELIMITER ;
\ No newline at end of file
diff --git a/db/routines/vn/procedures/invoiceIn_add.sql b/db/routines/vn/procedures/invoiceIn_add.sql
deleted file mode 100644
index 0898d6810..000000000
--- a/db/routines/vn/procedures/invoiceIn_add.sql
+++ /dev/null
@@ -1,234 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `sage`.`invoiceIn_add`(vInvoiceInFk INT, vXDiarioFk INT)
-BEGIN
-/**
- * Traslada la info de contabilidad relacionada con las facturas recibidas
- *
- * @vInvoiceInFk Factura recibida
- * @vXDiarioFk Id tabla XDiario
- */
-    DECLARE vInvoiceInOriginalFk INT;
-	DECLARE vDone BOOL DEFAULT FALSE;
-	DECLARE vBase DOUBLE;
-	DECLARE vVat DOUBLE;
-	DECLARE vRate DOUBLE;
-	DECLARE vTransactionCode INT;
-	DECLARE vCounter INT DEFAULT 0;
-	DECLARE vTransactionCodeOld INT;
-	DECLARE vTaxCode INT;
-	DECLARE vTaxCodeOld INT;
-	DECLARE vOperationCode VARCHAR(1);
-	DECLARE vIsIntracommunity BOOL DEFAULT FALSE;
-	DECLARE vSerialDua VARCHAR(1) DEFAULT 'D';
-	DECLARE vInvoiceTypeReceived VARCHAR(1);
-	DECLARE vInvoiceTypeInformative VARCHAR(1);
-	DECLARE vIsInformativeExportation BOOL DEFAULT FALSE;
-
-	DECLARE vCursor CURSOR FOR
-		SELECT it.taxableBase,
-				CAST((( it.taxableBase / 100) * t.PorcentajeIva) AS DECIMAL (10,2)),
-				t.PorcentajeIva,
-				it.transactionTypeSageFk,
-				it.taxTypeSageFk,
-				tty.isIntracommunity,
-				tt.ClaveOperacionDefecto
-			FROM vn.invoiceIn i
-				JOIN vn.invoiceInTax it ON it.InvoiceInFk = i.id
-				JOIN TiposIva t ON t.CodigoIva = it.taxTypeSageFk
-				JOIN taxType tty ON tty.id = t.CodigoIva
-				JOIN TiposTransacciones tt ON tt.CodigoTransaccion = it.transactionTypeSageFk
-				LEFT JOIN vn.dua d ON d.id = vInvoiceInFk
-			WHERE i.id = vInvoiceInFk
-				AND d.id IS NULL;
-
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-
-	DELETE FROM movContaIVA
-		WHERE id = vXDiarioFk;
-
-	SELECT codeSage INTO vInvoiceTypeReceived
-		FROM invoiceType WHERE code ='received';
-
-	SELECT codeSage INTO vInvoiceTypeInformative
-		FROM invoiceType WHERE code ='informative';
-
-	INSERT INTO movContaIVA(id, LibreA1)
-		VALUES (vXDiarioFk, vInvoiceInFk);
-
-	OPEN vCursor;
-
-	l: LOOP
-		FETCH vCursor INTO vBase,
-				vVat,
-				vRate,
-				vTransactionCode,
-				vTaxCode,
-				vIsIntracommunity,
-				vOperationCode;
-
-		IF vDone THEN
-			LEAVE l;
-		END IF;
-
-		SET vTransactionCodeOld = vTransactionCode;
-		SET vTaxCodeOld = vTaxCode;
-
-		IF vOperationCode IS NOT NULL THEN
-			UPDATE movContaIVA
-				SET ClaveOperacionFactura = vOperationCode
-				WHERE id = vXDiarioFk;
-		END IF;
-
-		SET vCounter = vCounter + 1;
-		CASE vCounter
-			WHEN 1 THEN
-				 UPDATE movContaIVA
-					SET BaseIva1 = vBase,
-						PorIva1 = vRate,
-						CuotaIva1 = vVat,
-						CodigoTransaccion1 = vTransactionCode,
-						CodigoIva1 = vTaxCode
-					WHERE id = vXDiarioFk;
-
-			WHEN 2 THEN
-				UPDATE movContaIVA
-					SET BaseIva2 = vBase,
-						PorIva2 = vRate,
-						CuotaIva2 = vVat,
-						CodigoTransaccion2 = vTransactionCode,
-						CodigoIva2 = vTaxCode
-					WHERE id = vXDiarioFk;
-			WHEN 3 THEN
-				UPDATE movContaIVA
-					SET BaseIva3 = vBase,
-						PorIva3 = vRate,
-						CuotaIva3 = vVat,
-						CodigoTransaccion3 = vTransactionCode,
-						CodigoIva3 = vTaxCode
-					WHERE id = vXDiarioFk;
-			WHEN 4 THEN
-				UPDATE movContaIVA
-					SET BaseIva4 = vBase,
-						PorIva4 = vRate,
-						CuotaIva4 = vVat,
-						CodigoTransaccion4 = vTransactionCode,
-						CodigoIva4 = vTaxCode
-					WHERE id = vXDiarioFk;
-			ELSE
-				SELECT vXDiarioFk INTO vXDiarioFk;
-		END CASE;
-
-		IF vIsIntracommunity THEN
-			UPDATE movContaIVA
-				SET Intracomunitaria = TRUE
-				WHERE id = vXDiarioFk;
-		END IF;
-
-		SET vTransactionCodeOld = vTransactionCode;
-		SET vTaxCodeOld = vTaxCode;
-
-	END LOOP;
-
-	CLOSE vCursor;
-
-	SELECT d.ASIEN AND x.ASIEN IS NULL INTO vIsInformativeExportation
-		FROM vn.dua d
-			LEFT JOIN vn.XDiario x ON x.ASIEN = d.ASIEN
-				AND x.SERIE = vSerialDua COLLATE utf8mb3_unicode_ci
-		WHERE d.ASIEN = (
-			SELECT ASIEN
-				FROM vn.XDiario
-				WHERE id = vXDiarioFk)
-		LIMIT 1;
-
-	UPDATE movContaIVA mci
-			JOIN tmp.invoiceIn ii ON ii.id = vInvoiceInFk
-			JOIN vn.XDiario x ON x.id = mci.id
-			LEFT JOIN tmp.invoiceDua id ON id.id = mci.id
-			JOIN vn.supplier s ON s.id = ii.supplierFk
-			JOIN Naciones n ON n.countryFk = s.countryFk
-		SET mci.CodigoDivisa = ii.currencyFk,
-			mci.Año = YEAR(ii.issued),
-			mci.Serie = ii.serial,
-			mci.Factura = ii.id,
-			mci.FechaFactura = ii.issued,
-			mci.ImporteFactura = IFNULL(mci.BaseIva1, 0) + IFNULL(mci.CuotaIva1, 0) +
-								IFNULL(mci.BaseIva2, 0) + IFNULL(mci.CuotaIva2, 0) +
-								IFNULL(mci.BaseIva3, 0) + IFNULL(mci.CuotaIva3, 0) +
-								IFNULL(mci.BaseIva4, 0) + IFNULL(mci.CuotaIva4, 0),
-			mci.TipoFactura = IF(id.id,
-				IF( ii.serial = vSerialDua COLLATE utf8mb3_unicode_ci, vInvoiceTypeReceived, vInvoiceTypeInformative),
-				IF(vIsInformativeExportation,vInvoiceTypeInformative, vInvoiceTypeReceived)),
-			mci.CodigoCuentaFactura = x.SUBCTA,
-			mci.CifDni = IF(LEFT(TRIM(s.nif), 2) = n.SiglaNacion, SUBSTRING(TRIM(s.nif), 3), s.nif),
-			mci.Nombre = s.name,
-			mci.SiglaNacion = n.SiglaNacion,
-			mci.EjercicioFactura = YEAR(ii.issued),
-			mci.FechaOperacion = ii.issued,
-			mci.MantenerAsiento = TRUE,
-			mci.SuFacturaNo = ii.supplierRef,
-			mci.IvaDeducible1 = IF(id.id, FALSE, IF(IFNULL(mci.BaseIva1, FALSE) = FALSE, FALSE, ii.isVatDeductible)),
-			mci.IvaDeducible2 = IF(id.id, FALSE, IF(IFNULL(mci.BaseIva2, FALSE) = FALSE, FALSE, ii.isVatDeductible)),
-			mci.IvaDeducible3 = IF(id.id, FALSE, IF(IFNULL(mci.BaseIva3, FALSE) = FALSE, FALSE, ii.isVatDeductible)),
-			mci.IvaDeducible4 = IF(id.id, FALSE, IF(IFNULL(mci.BaseIva4, FALSE) = FALSE, FALSE, ii.isVatDeductible)),
-			mci.FechaFacturaOriginal = x.FECHA_EX
-		WHERE mci.id = vXDiarioFk;
-
-	-- RETENCIONES
-	UPDATE movContaIVA mci
-			JOIN vn.invoiceIn ii ON ii.id = vInvoiceInFk
-			JOIN vn.XDiario x ON x.id = mci.id
-			JOIN vn.supplier s ON s.id = supplierFk
-			JOIN vn.invoiceInTax iit ON iit.invoiceInFk = ii.id
-			JOIN vn.expense e ON e.id = iit.expenseFk
-			JOIN TiposRetencion t ON t.CodigoRetencion = ii.withholdingSageFk
-			LEFT JOIN tmp.invoiceDua id ON id.id = mci.id
-			JOIN (SELECT SUM(x2.BASEEURO) taxableBase, SUM(x2.EURODEBE) taxBase
-					FROM vn.XDiario x1
-						JOIN vn.XDiario x2 ON x1.ASIEN = x2.ASIEN
-					WHERE x2.BASEEURO <> 0
-						AND x1.id = vXDiarioFk
-				)sub
-			JOIN ClavesOperacion co ON co.Descripcion = 'Arrendamiento de locales de negocio'
-		SET mci.CodigoRetencion = t.CodigoRetencion,
-			mci.ClaveOperacionFactura = IF( t.Retencion = 'ARRENDAMIENTO Y SUBARRENDAMIENTO', co.ClaveOperacionFactura_, mci.ClaveOperacionFactura),
-			mci.BaseRetencion = IF (t.Retencion = 'ACTIVIDADES AGRICOLAS O GANADERAS', sub.taxableBase + sub.taxBase, sub.taxableBase),
-			mci.PorRetencion = t.PorcentajeRetencion,
-			mci.ImporteRetencion = iit.taxableBase * - 1
-		WHERE mci.id = vXDiarioFk
-			AND e.name = 'Retenciones'
-			AND id.id IS NULL;
-
-	SELECT correctedFk INTO vInvoiceInOriginalFk
-		FROM vn.invoiceInCorrection
-		WHERE correctingFk = vInvoiceInFk;
-
-	IF vInvoiceInOriginalFk THEN 
-
-		UPDATE movContaIVA mci
-				JOIN vn.invoiceInRefund iir ON iir.invoiceInRefundFk = vInvoiceInFk
-				JOIN (SELECT issued,
-							SUM(sub.taxableBase) taxableBase, 
-							SUM(ROUND((sub.taxableBase * sub.PorcentajeIva) / 100 , 2)) vat
-						FROM(SELECT issued,
-									SUM(iit.taxableBase) taxableBase, 
-									ti.PorcentajeIva
-								FROM vn.invoiceIn i 
-									JOIN vn.invoiceInTax iit ON iit.invoiceInFk = i.id
-									JOIN sage.TiposIva ti ON ti.CodigoIva = iit.taxTypeSageFk
-								WHERE i.id = vInvoiceInOriginalFk
-								GROUP BY ti.CodigoIva)sub
-					)invoiceInOriginal
-				JOIN ClavesOperacion co ON co.Descripcion = 'Factura rectificativa'
-			SET mci.TipoRectificativa = iir.refundCategoryFk,
-				mci.ClaseAbonoRectificativas = iir.refundType, 
-				mci.FechaFacturaOriginal = invoiceInOriginal.issued,
-				mci.FechaOperacion = invoiceInOriginal.issued,
-				mci.BaseImponibleOriginal = invoiceInOriginal.taxableBase,
-				mci.CuotaIvaOriginal = invoiceInOriginal.vat,
-				mci.ClaveOperacionFactura = co.ClaveOperacionFactura_
-			WHERE mci.id = vXDiarioFk;
-
-	END IF;
-END$$
-DELIMITER ;
\ No newline at end of file

From 8119106e692624e53807db4c612229b88bd94cb7 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 15 Mar 2024 15:40:54 +0100
Subject: [PATCH 09/22] hotFix: try to debug closeAll

---
 modules/ticket/back/methods/ticket/closeAll.js | 3 ++-
 modules/ticket/back/methods/ticket/closure.js  | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/ticket/back/methods/ticket/closeAll.js b/modules/ticket/back/methods/ticket/closeAll.js
index 46c45aa92..edd1155ba 100644
--- a/modules/ticket/back/methods/ticket/closeAll.js
+++ b/modules/ticket/back/methods/ticket/closeAll.js
@@ -57,7 +57,8 @@ module.exports = Self => {
                     AND t.refFk IS NULL
                 GROUP BY t.id
         `, [toDate, toDate]);
-
+        const ticketIds = tickets.map(ticket => ticket.id);
+        await Self.rawSql(`CALL util.debugAdd('nightInvoicing', ?)`, [ticketIds.join(',')]);
         await closure(ctx, Self, tickets);
 
         await Self.rawSql(`
diff --git a/modules/ticket/back/methods/ticket/closure.js b/modules/ticket/back/methods/ticket/closure.js
index 1d04679d3..14b040324 100644
--- a/modules/ticket/back/methods/ticket/closure.js
+++ b/modules/ticket/back/methods/ticket/closure.js
@@ -11,6 +11,7 @@ module.exports = async function(ctx, Self, tickets, reqArgs = {}) {
     const failedtickets = [];
     for (const ticket of tickets) {
         try {
+            await Self.rawSql(`CALL util.debugAdd('invoicingTicket', ?)`, [ticket.id], {userId});
             await Self.rawSql(`CALL vn.ticket_closeByTicket(?)`, [ticket.id], {userId});
 
             const [invoiceOut] = await Self.rawSql(`

From 4f90fb06d838e65e72ed7deff43d88cd1966a150 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 18 Mar 2024 13:25:23 +0100
Subject: [PATCH 10/22] hotFix(debug) varchar to text

---
 db/versions/10959-bronzePalmetto/00-firstScript.sql | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 db/versions/10959-bronzePalmetto/00-firstScript.sql

diff --git a/db/versions/10959-bronzePalmetto/00-firstScript.sql b/db/versions/10959-bronzePalmetto/00-firstScript.sql
new file mode 100644
index 000000000..323238d2e
--- /dev/null
+++ b/db/versions/10959-bronzePalmetto/00-firstScript.sql
@@ -0,0 +1 @@
+ALTER TABLE util.debug MODIFY COLUMN value text CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL NULL;

From 7895a51e3364d7a154bc0cb1db8d2a9ccf0b44a7 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 20 Mar 2024 12:15:41 +0100
Subject: [PATCH 11/22] hotFix(closeAll): fix debug

---
 modules/ticket/back/methods/ticket/closeAll.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/ticket/back/methods/ticket/closeAll.js b/modules/ticket/back/methods/ticket/closeAll.js
index edd1155ba..11900bada 100644
--- a/modules/ticket/back/methods/ticket/closeAll.js
+++ b/modules/ticket/back/methods/ticket/closeAll.js
@@ -58,7 +58,11 @@ module.exports = Self => {
                 GROUP BY t.id
         `, [toDate, toDate]);
         const ticketIds = tickets.map(ticket => ticket.id);
-        await Self.rawSql(`CALL util.debugAdd('nightInvoicing', ?)`, [ticketIds.join(',')]);
+        await Self.rawSql(`
+            INSERT INTO util.debug (variable, value)
+                VALUES ('nightInvoicing', ?)
+        `, [ticketIds.join(',')]);
+
         await closure(ctx, Self, tickets);
 
         await Self.rawSql(`

From d53a053ccb9aed3e50f916a63daf77c1b9f39419 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Wed, 20 Mar 2024 13:07:02 +0100
Subject: [PATCH 12/22] refactor: refs #6923 Deteted procs

---
 .../vn2008/procedures/add_awb_component.sql   | 61 -------------------
 .../vn2008/procedures/agencyModeImbalance.sql | 50 ---------------
 2 files changed, 111 deletions(-)
 delete mode 100644 db/routines/vn2008/procedures/add_awb_component.sql
 delete mode 100644 db/routines/vn2008/procedures/agencyModeImbalance.sql

diff --git a/db/routines/vn2008/procedures/add_awb_component.sql b/db/routines/vn2008/procedures/add_awb_component.sql
deleted file mode 100644
index e75290b4b..000000000
--- a/db/routines/vn2008/procedures/add_awb_component.sql
+++ /dev/null
@@ -1,61 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`add_awb_component`(IN vAwbFk SMALLINT)
-BEGIN
-
-	DECLARE vShipped DATE;
-	DECLARE vHasStems BOOLEAN;
-
-	SELECT t.shipped, IF(a.stems, TRUE, FALSE)  
-			INTO vShipped, vHasStems
-		FROM vn.travel t
-			JOIN vn.awb a ON a.id = t.awbFk
-		WHERE awbFk = vAwbFk 
-		LIMIT 1;
-
-	INSERT IGNORE INTO awb_component (awb_id,Id_Proveedor,awb_component_type_id,awb_role_id,awb_unit_id,value,Id_Moneda) 
-		SELECT id, Id_Proveedor, awb_component_type_id, awb_role_id,awb_unit_id, LEAST(GREATEST(value1, IFNULL(min_value, value1)), IFNULL(max_value, value1)), Id_Moneda
-			FROM (
-				SELECT a.id,
-						IFNULL(act.carguera_id,
-							CASE awb_role_id 
-								WHEN 1 THEN a.carguera_id 
-								WHEN 2 THEN a.transitario_id 
-								WHEN 3 THEN f.airline_id 
-							END
-						) Id_Proveedor, 
-						act.awb_component_type_id,
-						act.awb_role_id,
-						act.awb_unit_id, 
-						value *
-							CASE awb_unit_id
-								WHEN '1000Tj-20' THEN ((CAST(stems AS SIGNED) - 20000)/1000) + (min_value / value)
-								WHEN '1000Tj-10' THEN ((CAST(stems AS SIGNED) - 10000)/1000) + (min_value / value)
-								WHEN '100GW' THEN peso/100 
-								WHEN 'AWB' THEN 1 -- No action
-								WHEN 'FB' THEN hb/2
-								WHEN 'GW' THEN peso
-								WHEN 'TW' THEN GREATEST(peso,volume_weight)
-								WHEN 'PN' THEN LEAST(90, value + a.propertyNumber * 10)
-							END value1, 
-						value,
-						act.Id_Moneda, 
-						act.min_value, 
-						act.max_value
-					FROM awb a 
-						JOIN flight f ON f.flight_id = a.flight_id 
-						LEFT JOIN awb_component_template act ON 
-							((IFNULL(act.carguera_id, a.carguera_id) = a.carguera_id AND awb_role_id = 1) 
-								OR (IFNULL(act.carguera_id, a.transitario_id) = a.transitario_id AND awb_role_id = 2)
-								OR (IFNULL(act.airline_id, f.airline_id) = f.airline_id AND awb_role_id = 3)
-								OR (awb_role_id = 4))
-							AND IFNULL(act.airport_out, f.airport_out) = f.airport_out 
-							AND IFNULL(act.airport_in, f.airport_in) = f.airport_in 
-							AND IFNULL(act.airline_id, f.airline_id) = f.airline_id 
-							AND INSTR(IFNULL(act.days, WEEKDAY(vShipped) + 1),WEEKDAY(vShipped) + 1)
-						JOIN awb_component_type acty ON acty.awb_component_type_id = act.awb_component_type_id 
-					WHERE a.id = vAwbFk AND Fecha <= vShipped 
-						AND (vHasStems = TRUE OR acty.hasStems)
-					ORDER BY Fecha DESC, act.days DESC LIMIT 10000000000000000000
-				) t;
-END$$
-DELIMITER ;
diff --git a/db/routines/vn2008/procedures/agencyModeImbalance.sql b/db/routines/vn2008/procedures/agencyModeImbalance.sql
deleted file mode 100644
index 89706f0d2..000000000
--- a/db/routines/vn2008/procedures/agencyModeImbalance.sql
+++ /dev/null
@@ -1,50 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn2008`.`agencyModeImbalance`(vStarted DATE, vEnded DATE)
-BEGIN
-/**
- * Devuelve el valor de los precios teorico, practico de las agencias
- * y si ademas es de mrw lo compara con su fichero previamente procesado
- *
- * @param vEktFk Identificador de edi.ekt
- */
-	DECLARE vEndedDayEnd DATETIME;
-
-	SET vEndedDayEnd = util.dayEnd(vEnded);
-
-	SELECT t.id ticketFk,t.addressFk,
-			CAST(v.amount AS DECIMAL (10,2)) AS VN,
-			CAST(v.amount - e.shipping_charge AS DECIMAL (10,2)) AS Difer,
-			CAST(mrwPrice AS DECIMAL (10,2)) mrwPrice,
-			CAST(e.shipping_charge - mrwPrice AS DECIMAL (10,2)) mrwDifference,
-			CAST(e.shipping_charge AS DECIMAL (10,2)) AS teorico,
-			CAST(e.extraCharge AS DECIMAL (10,2)) AS extraCharge,
-			t.packages, t.clientFk,
-			t.zoneFk, a.provinceFk, mrwCount
-		FROM  vn.ticket t
-			LEFT JOIN
-			(SELECT ticketFk, SUM(amount) amount, fc.shipped
-				FROM vn.sale_freightComponent fc
-					JOIN vn.ticket t ON t.id = fc.ticketFk
-					JOIN tmp.agencyMode am ON am.agencyModeFk = t.agencyModeFk
-				WHERE fc.shipped BETWEEN vStarted AND vEndedDayEnd
-						GROUP BY ticketFk) v ON t.id = v.ticketFk
-			LEFT JOIN (SELECT t.id,
-								SUM(t.zonePrice) shipping_charge,
-								SUM(IFNULL(aex.price,0)) extraCharge
-							FROM vn.ticket t
-								LEFT JOIN vn.expedition e ON e.ticketFk = t.id
-								LEFT JOIN vn.packaging p ON p.id = e.packagingFk
-								JOIN tmp.agencyMode amc ON amc.agencyModeFk = t.agencyModeFk
-								JOIN vn.agencyMode am ON am.id = amc.agencyModeFk
-								LEFT JOIN vn.agencyExtraCharge aex ON p.width+p.depth+p.height BETWEEN aex.sizeMin AND aex.sizeMax AND aex.agencyFk = am.agencyFk
-							WHERE t.shipped BETWEEN vStarted AND vEndedDayEnd
-							GROUP BY t.id
-					) e ON t.id = e.id
-			LEFT JOIN (SELECT ticketFk, SUM(price) mrwPrice, COUNT(*) mrwCount
-							FROM vn.mrw
-							GROUP BY ticketFk) mrw ON mrw.ticketFk = t.id
-			JOIN vn.address a ON a.id = t.addressFk
-			JOIN tmp.agencyMode am ON am.agencyModeFk = t.agencyModeFk
-		WHERE t.shipped BETWEEN vStarted AND vEndedDayEnd;
-END$$
-DELIMITER ;

From 5a45cf7ea2d47a8177edb4abbadb794a29b441ff Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 20 Mar 2024 13:39:26 +0100
Subject: [PATCH 13/22] refs #6842 remove sage

---
 db/routines/vn2008/views/empresa.sql | 1 -
 1 file changed, 1 deletion(-)

diff --git a/db/routines/vn2008/views/empresa.sql b/db/routines/vn2008/views/empresa.sql
index 3b43ee574..8c80a06e8 100644
--- a/db/routines/vn2008/views/empresa.sql
+++ b/db/routines/vn2008/views/empresa.sql
@@ -5,7 +5,6 @@ AS SELECT `c`.`id` AS `id`,
 	`c`.`code` AS `abbreviation`,
 	`c`.`supplierAccountFk` AS `Id_Proveedores_account`,
 	`c`.`workerManagerFk` AS `gerente_id`,
-	`c`.`sage200Company` AS `digito_factura`,
 	`c`.`phytosanitary` AS `phytosanitary`,
 	`c`.`companyCode` AS `CodigoEmpresa`,
 	`c`.`companyGroupFk` AS `empresa_grupo`,

From f7b458d3683cd4a7bfa0c9ddd8431623252406b6 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 20 Mar 2024 20:54:24 +0100
Subject: [PATCH 14/22] feat: refs #6302 delete after add to turn

---
 db/dump/fixtures.before.sql                   |  4 ++--
 e2e/paths/05-ticket/09_weekly.spec.js         | 20 +++++++++----------
 modules/ticket/back/models/ticket-weekly.js   |  8 ++++++++
 modules/ticket/front/descriptor-menu/index.js |  3 ++-
 .../front/descriptor-menu/locale/es.yml       |  1 +
 5 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/db/dump/fixtures.before.sql b/db/dump/fixtures.before.sql
index 795ffb25f..4e01532e2 100644
--- a/db/dump/fixtures.before.sql
+++ b/db/dump/fixtures.before.sql
@@ -760,8 +760,8 @@ INSERT INTO `vn`.`ticket`(`id`, `priority`, `agencyModeFk`,`warehouseFk`,`routeF
         (29, 1,     8,  1, 1,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1103, 'Phone Box',                                     123, NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL),
         (30, 1,     8,  1, 1,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1103, 'Phone Box',                                     123, NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL),
         (31, 1,     8,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),  DATE_ADD(util.VN_CURDATE(), INTERVAL + 2 DAY),                            1103, 'Phone Box',                                     123, NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL),
-        (32, 1,     8,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),  DATE_ADD(util.VN_CURDATE(), INTERVAL + 2 DAY),                            1103, 'Phone Box',                                     123, NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL);
-
+        (32, 1,     8,  1, 1,       DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),  DATE_ADD(util.VN_CURDATE(), INTERVAL + 2 DAY),                            1103, 'Phone Box',                                     123, NULL,     0, 1,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL),
+        (33, 1,     7,  1, 6,       util.VN_CURDATE(),                              DATE_ADD(util.VN_CURDATE(), INTERVAL + 1 DAY),                            1102, 'NY roofs',                                      122, NULL,     0, 3,      5, 1, util.VN_CURDATE(),                                   NULL,      NULL);
 INSERT INTO `vn`.`ticketObservation`(`id`, `ticketFk`, `observationTypeFk`, `description`)
     VALUES
         (1,  11, 1, 'ready'),
diff --git a/e2e/paths/05-ticket/09_weekly.spec.js b/e2e/paths/05-ticket/09_weekly.spec.js
index 74febfd01..20cfa0d13 100644
--- a/e2e/paths/05-ticket/09_weekly.spec.js
+++ b/e2e/paths/05-ticket/09_weekly.spec.js
@@ -24,7 +24,7 @@ describe('Ticket descriptor path', () => {
 
     it('should go back to the ticket index then search and access a ticket summary', async() => {
         await page.accessToSection('ticket.index');
-        await page.accessToSearchResult('11');
+        await page.accessToSearchResult('33');
     });
 
     it('should add the ticket to thursday turn using the descriptor more menu', async() => {
@@ -33,7 +33,7 @@ describe('Ticket descriptor path', () => {
         await page.waitToClick(selectors.ticketDescriptor.thursdayButton);
         const message = await page.waitForSnackbar();
 
-        expect(message.text).toContain('Data saved!');
+        expect(message.text).toContain('Current ticket deleted and added to shift');
     });
 
     it('should again click on the Tickets button of the top bar menu', async() => {
@@ -43,7 +43,7 @@ describe('Ticket descriptor path', () => {
         await page.waitForState('ticket.index');
     });
 
-    it('should confirm the ticket 11 was added to thursday', async() => {
+    it('should confirm the ticket 33 was added to thursday', async() => {
         await page.accessToSection('ticket.weekly.index');
         const result = await page.waitToGetProperty(selectors.ticketsIndex.thirdWeeklyTicket, 'value');
 
@@ -57,8 +57,8 @@ describe('Ticket descriptor path', () => {
         await page.waitForState('ticket.index');
     });
 
-    it('should now search for the ticket 11', async() => {
-        await page.accessToSearchResult('11');
+    it('should now search for the ticket 33', async() => {
+        await page.accessToSearchResult('33');
         await page.waitForState('ticket.card.summary');
     });
 
@@ -68,7 +68,7 @@ describe('Ticket descriptor path', () => {
         await page.waitToClick(selectors.ticketDescriptor.saturdayButton);
         const message = await page.waitForSnackbar();
 
-        expect(message.text).toContain('Data saved!');
+        expect(message.text).toContain('Current ticket deleted and added to shift');
     });
 
     it('should click on the Tickets button of the top bar menu once again', async() => {
@@ -78,7 +78,7 @@ describe('Ticket descriptor path', () => {
         await page.waitForState('ticket.index');
     });
 
-    it('should confirm the ticket 11 was added on saturday', async() => {
+    it('should confirm the ticket 33 was added on saturday', async() => {
         await page.accessToSection('ticket.weekly.index');
         await page.waitForTimeout(5000);
 
@@ -87,14 +87,14 @@ describe('Ticket descriptor path', () => {
         expect(result).toEqual('Saturday');
     });
 
-    it('should now search for the weekly ticket 11', async() => {
-        await page.doSearch('11');
+    it('should now search for the weekly ticket 33', async() => {
+        await page.doSearch('33');
         const nResults = await page.countElement(selectors.ticketsIndex.searchWeeklyResult);
 
         expect(nResults).toEqual(2);
     });
 
-    it('should delete the weekly ticket 11', async() => {
+    it('should delete the weekly ticket 33', async() => {
         await page.waitToClick(selectors.ticketsIndex.firstWeeklyTicketDeleteIcon);
         await page.waitToClick(selectors.ticketsIndex.acceptDeleteTurn);
         const message = await page.waitForSnackbar();
diff --git a/modules/ticket/back/models/ticket-weekly.js b/modules/ticket/back/models/ticket-weekly.js
index 8db53b283..b6b1d586c 100644
--- a/modules/ticket/back/models/ticket-weekly.js
+++ b/modules/ticket/back/models/ticket-weekly.js
@@ -1,4 +1,5 @@
 const UserError = require('vn-loopback/util/user-error');
+const LoopBackContext = require('loopback-context');
 
 module.exports = Self => {
     require('../methods/ticket-weekly/filter')(Self);
@@ -8,4 +9,11 @@ module.exports = Self => {
             return new UserError(`This ticket is already on weekly tickets`);
         return err;
     });
+
+    Self.observe('after save', async ctx => {
+        const loopBackContext = LoopBackContext.getCurrentContext();
+        const httpCtx = {req: loopBackContext.active};
+        const httpRequest = httpCtx.req.http;
+        await Self.app.models.Ticket.setDeleted(httpRequest, ctx.instance.ticketFk, ctx.options);
+    });
 };
diff --git a/modules/ticket/front/descriptor-menu/index.js b/modules/ticket/front/descriptor-menu/index.js
index d2dd13f73..52cac141c 100644
--- a/modules/ticket/front/descriptor-menu/index.js
+++ b/modules/ticket/front/descriptor-menu/index.js
@@ -147,7 +147,8 @@ class Controller extends Section {
         return this.$http.patch(`TicketWeeklies`, params)
             .then(() => {
                 this.$.addTurn.hide();
-                this.vnApp.showSuccess(this.$t('Data saved!'));
+                this.vnApp.showSuccess(this.$t('Current ticket deleted and added to shift'));
+                this.reload();
             });
     }
 
diff --git a/modules/ticket/front/descriptor-menu/locale/es.yml b/modules/ticket/front/descriptor-menu/locale/es.yml
index 111fc2702..008c9a358 100644
--- a/modules/ticket/front/descriptor-menu/locale/es.yml
+++ b/modules/ticket/front/descriptor-menu/locale/es.yml
@@ -28,3 +28,4 @@ Create a single ticket with all the content of the current ticket: Crea un ticke
 Set ticket weight: Establecer peso al ticket
 Ticket weight: Peso del ticket
 This address has incoterms, you should set the weight before invoice it: Este consigatario tiene incoterms, deberías establecer el peso antes de facturar
+Current ticket deleted and added to shift: Ticket actual borrado y añadido a turno
\ No newline at end of file

From da8fbb5a926d17c78b504d7104af07ef4abdde2c Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 20 Mar 2024 21:14:01 +0100
Subject: [PATCH 15/22] fix:  refs #6302 spec

---
 modules/ticket/back/methods/ticket/specs/filter.spec.js | 2 +-
 modules/ticket/front/descriptor-menu/index.spec.js      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/ticket/back/methods/ticket/specs/filter.spec.js b/modules/ticket/back/methods/ticket/specs/filter.spec.js
index c1d3f1a9c..e495a41f5 100644
--- a/modules/ticket/back/methods/ticket/specs/filter.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/filter.spec.js
@@ -68,7 +68,7 @@ describe('ticket filter()', () => {
             const filter = {};
             const result = await models.Ticket.filter(ctx, filter, options);
 
-            expect(result.length).toEqual(6);
+            expect(result.length).toEqual(7);
 
             await tx.rollback();
         } catch (e) {
diff --git a/modules/ticket/front/descriptor-menu/index.spec.js b/modules/ticket/front/descriptor-menu/index.spec.js
index 80ad9a33a..94a991db8 100644
--- a/modules/ticket/front/descriptor-menu/index.spec.js
+++ b/modules/ticket/front/descriptor-menu/index.spec.js
@@ -41,6 +41,7 @@ describe('Ticket Component vnTicketDescriptorMenu', () => {
     }));
 
     describe('addTurn()', () => {
+        pending('refs #6302');
         it('should make a query and call $.addTurn.hide() and vnApp.showSuccess()', () => {
             controller.$.addTurn = {hide: () => {}};
             jest.spyOn(controller.$.addTurn, 'hide');

From de83cef68cf16c55bd9767cfa0dfd21b239f059f Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Thu, 21 Mar 2024 08:01:27 +0100
Subject: [PATCH 16/22] build: refs #5846 HOTFIX Myt updated

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9e897823d..aa410f8df 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
         "@babel/plugin-syntax-dynamic-import": "^7.7.4",
         "@babel/preset-env": "^7.11.0",
         "@babel/register": "^7.7.7",
-        "@verdnatura/myt": "^1.6.8",
+        "@verdnatura/myt": "^1.6.9",
         "angular-mocks": "^1.7.9",
         "babel-jest": "^26.0.1",
         "babel-loader": "^8.2.4",

From bbbd212547898dc677cae5c0531e102a2e0a4f16 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Thu, 21 Mar 2024 08:14:59 +0100
Subject: [PATCH 17/22] build: refs #5846 HOTFIX Myt updated

---
 pnpm-lock.yaml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b1f68378d..3f0473929 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -131,8 +131,8 @@ devDependencies:
     specifier: ^7.7.7
     version: 7.23.7(@babel/core@7.23.9)
   '@verdnatura/myt':
-    specifier: ^1.6.8
-    version: 1.6.8
+    specifier: ^1.6.9
+    version: 1.6.9
   angular-mocks:
     specifier: ^1.7.9
     version: 1.8.3
@@ -2633,8 +2633,8 @@ packages:
     dev: false
     optional: true
 
-  /@verdnatura/myt@1.6.8:
-    resolution: {integrity: sha512-jpadr6yAR9TQXPv+has5yOYAolR/YEzsxbLgMR7BoDrpLyVFLHJEy4Dfe+Hy11r3AmxCB/8lWM+La1YGvXMWOA==}
+  /@verdnatura/myt@1.6.9:
+    resolution: {integrity: sha512-29IauYra9igfdPWwV4+pVV/tBXvIg0fkVHEpSz8Zz3G3lRtzm286FN2Kv6hZkxmD/F1n52O37jN9WLiLHDTW1Q==}
     hasBin: true
     dependencies:
       '@sqltools/formatter': 1.2.5
@@ -4886,6 +4886,7 @@ packages:
   /deep-extend@0.6.0:
     resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==}
     engines: {node: '>=4.0.0'}
+    requiresBuild: true
 
   /deep-is@0.1.4:
     resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
@@ -12714,6 +12715,7 @@ packages:
   /strip-json-comments@2.0.1:
     resolution: {integrity: sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==}
     engines: {node: '>=0.10.0'}
+    requiresBuild: true
 
   /strip-json-comments@3.1.1:
     resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}

From 1cd495df06984f6d43d5bd60f96cc765bd06649b Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Thu, 21 Mar 2024 09:25:33 +0100
Subject: [PATCH 18/22] fix: refs #7018 Fix invoiceInTax_recalc

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

diff --git a/db/routines/vn/procedures/invoiceInTax_recalc.sql b/db/routines/vn/procedures/invoiceInTax_recalc.sql
index 3b5ce5247..8c4015bc3 100644
--- a/db/routines/vn/procedures/invoiceInTax_recalc.sql
+++ b/db/routines/vn/procedures/invoiceInTax_recalc.sql
@@ -11,7 +11,7 @@ BEGIN
  */
 	DECLARE vRate DOUBLE DEFAULT 1;
 	DECLARE vDated DATE;
-	DECLARE vExpenseFk INT;
+	DECLARE vExpenseFk VARCHAR(10);
 
 	SELECT MAX(rr.dated) INTO vDated
 		FROM referenceRate rr

From d0067c80967b9a8b20b0cb696922b89869fd756f Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Thu, 21 Mar 2024 11:30:10 +0100
Subject: [PATCH 19/22] ticket #167473 Hotfix

---
 db/routines/bs/procedures/ventas_contables_add.sql | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/db/routines/bs/procedures/ventas_contables_add.sql b/db/routines/bs/procedures/ventas_contables_add.sql
index 12b2738f3..9e2b75f6d 100644
--- a/db/routines/bs/procedures/ventas_contables_add.sql
+++ b/db/routines/bs/procedures/ventas_contables_add.sql
@@ -23,7 +23,7 @@ BEGIN
 		ENGINE = MEMORY
 		SELECT Id_Ticket
 			FROM vn2008.Tickets t
-				JOIN vn.invoiceOut io ON io.id = t.Factura
+				JOIN vn.invoiceOut io ON io.`ref` = t.Factura
 			WHERE year(io.issued) = vYear
 				AND month(io.issued) = vMonth;
 
@@ -47,12 +47,7 @@ BEGIN
 			  , tp.reino_id
 			  , a.tipo_id
 			  , t.empresa_id
-			  , a.expenseFk
-				+ IF(e.empresa_grupo = e2.empresa_grupo
-									  ,1
-									  ,IF(e2.empresa_grupo,2,0)
-									  ) * 100000
-				+ tp.reino_id * 1000 as Gasto
+			  , a.expenseFk gasto
 			FROM vn2008.Movimientos m
 				JOIN vn2008.Tickets t on t.Id_Ticket = m.Id_Ticket
 				JOIN vn2008.Consignatarios cs on cs.Id_Consigna = t.Id_Consigna

From 535dd406250ddd6b0764142e6a7681b9d51e8b6d Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Thu, 21 Mar 2024 12:06:59 +0100
Subject: [PATCH 20/22] fix: refs #7018 Fix invoiceInTax_recalc

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

diff --git a/db/routines/vn/procedures/invoiceInTax_recalc.sql b/db/routines/vn/procedures/invoiceInTax_recalc.sql
index 3b5ce5247..40fd98378 100644
--- a/db/routines/vn/procedures/invoiceInTax_recalc.sql
+++ b/db/routines/vn/procedures/invoiceInTax_recalc.sql
@@ -11,18 +11,20 @@ BEGIN
  */
 	DECLARE vRate DOUBLE DEFAULT 1;
 	DECLARE vDated DATE;
-	DECLARE vExpenseFk INT;
+	DECLARE vCurrencyFk INT;
+	DECLARE vExpenseFk VARCHAR(10);
 
-	SELECT MAX(rr.dated) INTO vDated
+	SELECT MAX(rr.dated), ii.currencyFk INTO vDated, vCurrencyFk
 		FROM referenceRate rr
 			JOIN invoiceIn ii ON ii.id = vInvoiceInFk
 		WHERE rr.dated <= ii.issued
 			AND rr.currencyFk = ii.currencyFk;
 
-	IF vDated THEN
+	IF vDated AND vCurrencyFk THEN
 		SELECT `value` INTO vRate
 			FROM referenceRate
-			WHERE dated = vDated;
+			WHERE dated = vDated
+				AND currencyFk = vCurrencyFk;
 	END IF;
 
 	DELETE FROM invoiceInTax WHERE invoiceInFk = vInvoiceInFk;

From ee67820c20b2257c2358b81607b0474470c96168 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Thu, 21 Mar 2024 12:14:48 +0100
Subject: [PATCH 21/22] refactor: refs #7018 Fix invoiceInTax_recalc

---
 db/routines/vn/procedures/invoiceInTax_recalc.sql | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/db/routines/vn/procedures/invoiceInTax_recalc.sql b/db/routines/vn/procedures/invoiceInTax_recalc.sql
index 40fd98378..4e20b01d3 100644
--- a/db/routines/vn/procedures/invoiceInTax_recalc.sql
+++ b/db/routines/vn/procedures/invoiceInTax_recalc.sql
@@ -10,22 +10,15 @@ BEGIN
  * @param vInvoiceInFk Id de factura recibida
  */
 	DECLARE vRate DOUBLE DEFAULT 1;
-	DECLARE vDated DATE;
-	DECLARE vCurrencyFk INT;
 	DECLARE vExpenseFk VARCHAR(10);
 
-	SELECT MAX(rr.dated), ii.currencyFk INTO vDated, vCurrencyFk
+	SELECT `value` INTO vRate
 		FROM referenceRate rr
 			JOIN invoiceIn ii ON ii.id = vInvoiceInFk
 		WHERE rr.dated <= ii.issued
-			AND rr.currencyFk = ii.currencyFk;
-
-	IF vDated AND vCurrencyFk THEN
-		SELECT `value` INTO vRate
-			FROM referenceRate
-			WHERE dated = vDated
-				AND currencyFk = vCurrencyFk;
-	END IF;
+			AND rr.currencyFk = ii.currencyFk
+		ORDER BY dated DESC
+		LIMIT 1;
 
 	DELETE FROM invoiceInTax WHERE invoiceInFk = vInvoiceInFk;
 

From 2b26153bfa597fcd84f200a292f03aa2daad672c Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Thu, 21 Mar 2024 12:52:04 +0100
Subject: [PATCH 22/22] refactor: refs #7018 Requested changes

---
 db/routines/bs/procedures/ventas_contables_add.sql | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/db/routines/bs/procedures/ventas_contables_add.sql b/db/routines/bs/procedures/ventas_contables_add.sql
index 9e2b75f6d..66c012a19 100644
--- a/db/routines/bs/procedures/ventas_contables_add.sql
+++ b/db/routines/bs/procedures/ventas_contables_add.sql
@@ -47,7 +47,12 @@ BEGIN
 			  , tp.reino_id
 			  , a.tipo_id
 			  , t.empresa_id
-			  , a.expenseFk gasto
+			  , a.expenseFk
+				+ IF(e.empresa_grupo = e2.empresa_grupo
+									  ,1
+									  ,IF(e2.empresa_grupo,2,0)
+									  ) * 100000
+				+ tp.reino_id * 1000 as Gasto
 			FROM vn2008.Movimientos m
 				JOIN vn2008.Tickets t on t.Id_Ticket = m.Id_Ticket
 				JOIN vn2008.Consignatarios cs on cs.Id_Consigna = t.Id_Consigna