feat: refs #6777 change dependecies vn2008 to vn

2024-02-05 13:52:28 +01:00 · 2024-02-05 13:52:28 +01:00 · 01512c7d36
parent f5108a911f
commit 01512c7d36
19 changed files with 132 additions and 142 deletions
--- a/db/routines/bi/procedures/Greuge_Evolution_Add.sql
+++ b/db/routines/bi/procedures/Greuge_Evolution_Add.sql
@ -92,12 +92,12 @@ BEGIN
 		UPDATE bi.Greuge_Evolution ge 
 			JOIN (
 				   SELECT cs.Id_Cliente, sum(Valor * Cantidad) as Importe
-					   FROM vn2008.Tickets t
-					   JOIN vn2008.Consignatarios cs on cs.Id_Consigna = t.Id_Consigna
-					   JOIN vn2008.Movimientos m on m.Id_Ticket = t.Id_Ticket
+					   FROM vn.ticket t
+					   JOIN vn2008.Consignatarios cs on cs.Id_Consigna = t.addressFk
+					   JOIN vn2008.Movimientos m on m.Id_Ticket = t.id
 					   JOIN vn2008.Movimientos_componentes mc on mc.Id_Movimiento = m.Id_Movimiento
-				   WHERE t.Fecha >= datFEC 
-					   AND t.Fecha < datFEC_TOMORROW
+				   WHERE t.shipped >= datFEC 
+					   AND t.shipped < datFEC_TOMORROW
 					   AND mc.Id_Componente = 17 -- Recobro
 				   GROUP BY cs.Id_Cliente
 				 ) sub using(Id_Cliente)
--- a/db/routines/bi/procedures/analisis_ventas_update.sql
+++ b/db/routines/bi/procedures/analisis_ventas_update.sql
@ -10,18 +10,18 @@ BEGIN
 			OR (Año = YEAR(vLastMonth) AND Mes >= MONTH(vLastMonth));

 	INSERT INTO analisis_ventas (
-            Familia,
-            Reino,
-            Comercial,
-            Comprador,
-            Provincia,
-            almacen,
-            Año,
-            Mes,
-            Semana,
-            Vista,
-            Importe
-        )
+			Familia,
+			Reino,
+			Comercial,
+			Comprador,
+			Provincia,
+			almacen,
+			Año,
+			Mes,
+			Semana,
+			Vista,
+			Importe
+		)
 		SELECT 
 			tp.Tipo AS Familia,
 			r.reino AS Reino,
@ -35,19 +35,19 @@ BEGIN
 			dm.description AS Vista,
 			bt.importe AS Importe
 		FROM bs.ventas bt
-            LEFT JOIN vn2008.Tipos tp ON tp.tipo_id = bt.tipo_id
-            LEFT JOIN vn2008.reinos r ON r.id = tp.reino_id
-            LEFT JOIN vn2008.Clientes c on c.Id_Cliente = bt.Id_Cliente
-            LEFT JOIN vn2008.Trabajadores tr ON tr.Id_Trabajador = c.Id_Trabajador
-            LEFT JOIN vn2008.Trabajadores tr2 ON tr2.Id_Trabajador = tp.Id_Trabajador
-            JOIN vn2008.time tm ON tm.date = bt.fecha
-            JOIN vn2008.Movimientos m ON m.Id_Movimiento = bt.Id_Movimiento
-            LEFT JOIN vn2008.Tickets t ON t.Id_Ticket = m.Id_Ticket
-            JOIN vn2008.Agencias a ON a.Id_Agencia = t.Id_Agencia
-            LEFT JOIN vn.deliveryMethod dm ON dm.id = a.Vista
-            LEFT JOIN vn2008.Consignatarios cs ON cs.Id_Consigna = t.Id_Consigna
-            LEFT JOIN vn2008.province p ON p.province_id = cs.province_id
-            LEFT JOIN vn.warehouse w ON w.id = t.warehouse_id
-        WHERE bt.fecha >= vLastMonth AND r.mercancia;
+			LEFT JOIN vn2008.Tipos tp ON tp.tipo_id = bt.tipo_id
+			LEFT JOIN vn2008.reinos r ON r.id = tp.reino_id
+			LEFT JOIN vn2008.Clientes c on c.Id_Cliente = bt.Id_Cliente
+			LEFT JOIN vn2008.Trabajadores tr ON tr.Id_Trabajador = c.Id_Trabajador
+			LEFT JOIN vn2008.Trabajadores tr2 ON tr2.Id_Trabajador = tp.Id_Trabajador
+			JOIN vn2008.time tm ON tm.date = bt.fecha
+			JOIN vn2008.Movimientos m ON m.Id_Movimiento = bt.Id_Movimiento
+			LEFT JOIN vn.ticket t ON t.id = m.Id_Ticket
+			JOIN vn2008.Agencias a ON a.Id_Agencia = t.agencyModeFk
+			LEFT JOIN vn.deliveryMethod dm ON dm.id = a.Vista
+			LEFT JOIN vn2008.Consignatarios cs ON cs.Id_Consigna = t.addressFk
+			LEFT JOIN vn2008.province p ON p.province_id = cs.province_id
+			LEFT JOIN vn.warehouse w ON w.id = t.warehouseFk
+		WHERE bt.fecha >= vLastMonth AND r.mercancia;
 END$$
 DELIMITER ;
--- a/db/routines/bi/procedures/claim_ratio_routine.sql
+++ b/db/routines/bi/procedures/claim_ratio_routine.sql
@ -59,18 +59,18 @@ BEGIN
 	DROP TEMPORARY TABLE IF EXISTS tmp.ticket_list;
 	CREATE TEMPORARY TABLE tmp.ticket_list
 	(PRIMARY KEY (Id_Ticket))
-	SELECT DISTINCT t.Id_Ticket
+	SELECT DISTINCT t.id
 			FROM vn2008.Movimientos_componentes mc
 				JOIN vn2008.Movimientos m ON mc.Id_Movimiento = m.Id_Movimiento
-				JOIN vn2008.Tickets t ON t.Id_Ticket = m.Id_Ticket
-				JOIN vn2008.Tickets_state ts ON ts.Id_Ticket = t.Id_Ticket
-				JOIN vn.ticketTracking tt ON tt.id = ts.inter_id
-				JOIN vn2008.state s ON s.id = tt.stateFk
+				JOIN vn.ticket t ON t.id = m.Id_Ticket
+				JOIN vn.ticketLastState ts ON ts.ticketFk = t.id
+				JOIN vn.ticketTracking tt ON tt.id = ts.ticketTrackingFk
+				JOIN vn.state s ON s.id = tt.stateFk
 			WHERE mc.Id_Componente = 17
 				AND mc.greuge = 0
-				AND t.Fecha >= '2016-10-01'
-				AND t.Fecha < util.VN_CURDATE()
-				AND s.alert_level >= 3;
+				AND t.shipped >= '2016-10-01'
+				AND t.shipped < util.VN_CURDATE()
+				AND s.alertLevel >= 3;

 	DELETE g.*
 			FROM vn2008.Greuges g
@ -82,15 +82,15 @@ BEGIN
 		SELECT Id_Cliente
 				,concat('recobro ', m.Id_Ticket), - round(SUM(mc.Valor*Cantidad),2)
 					AS dif
-				,date(t.Fecha)
+				,date(t.shipped)
 				, 2
 				,tt.Id_Ticket
 			FROM vn2008.Movimientos m
-				JOIN vn2008.Tickets t ON t.Id_Ticket = m.Id_Ticket
-				JOIN tmp.ticket_list tt ON tt.Id_Ticket = t.Id_Ticket
+				JOIN vn.ticket t ON t.id = m.Id_Ticket
+				JOIN tmp.ticket_list tt ON tt.Id_Ticket = t.id
 				JOIN vn2008.Movimientos_componentes mc
 					ON mc.Id_Movimiento = m.Id_Movimiento AND mc.Id_Componente = 17
-			GROUP BY t.Id_Ticket
+			GROUP BY t.id
 				HAVING ABS(dif) > 1;

 	UPDATE vn2008.Movimientos_componentes mc
--- a/db/routines/bi/procedures/comparativa_add.sql
+++ b/db/routines/bi/procedures/comparativa_add.sql
@ -15,17 +15,17 @@ BEGIN
    IF lastCOMP < vMaxPeriod - 3 AND vMaxWeek > 3 THEN
    
 		REPLACE vn2008.Comparativa(Periodo, Id_Article, warehouse_id, Cantidad,price)
-			SELECT tm.period as Periodo, m.Id_Article, t.warehouse_id, sum(m.Cantidad), sum(v.importe)
+			SELECT tm.period as Periodo, m.Id_Article, t.warehouseFk, sum(m.Cantidad), sum(v.importe)
            FROM bs.ventas v
            JOIN vn2008.time tm ON tm.date = v.fecha
            JOIN vn2008.Movimientos m ON m.Id_Movimiento = v.Id_Movimiento
            JOIN vn2008.Tipos tp ON tp.tipo_id = v.tipo_id
            JOIN vn2008.reinos r ON r.id = tp.reino_id
-            JOIN vn2008.Tickets t ON t.Id_Ticket = m.Id_Ticket
+            JOIN vn.ticket t ON t.id = m.Id_Ticket
            WHERE tm.period BETWEEN lastCOMP AND vMaxPeriod - 3
-            AND t.Id_Cliente NOT IN(400,200)
-            AND t.warehouse_id NOT IN (0,13)		
-            GROUP BY m.Id_Article, Periodo, t.warehouse_id;
+            AND t.clientFk NOT IN(400,200)
+            AND t.warehouseFk NOT IN (0,13)		
+            GROUP BY m.Id_Article, Periodo, t.warehouseFk;

    END IF;
 END$$
--- a/db/routines/bi/procedures/comparativa_add_manual.sql
+++ b/db/routines/bi/procedures/comparativa_add_manual.sql
@ -25,16 +25,16 @@ BEGIN
 		WHERE Periodo BETWEEN periodStart AND periodEnd;

 	INSERT INTO vn2008.Comparativa(Periodo, Id_Article, warehouse_id, Cantidad,price)
-		SELECT tm.period as Periodo, m.Id_Article, t.warehouse_id, sum(m.Cantidad), sum(v.importe)
+		SELECT tm.period as Periodo, m.Id_Article, t.warehouseFk, sum(m.Cantidad), sum(v.importe)
 			FROM bs.ventas v
 				JOIN vn2008.time tm ON tm.date = v.fecha
 				JOIN vn2008.Movimientos m ON m.Id_Movimiento = v.Id_Movimiento
 				JOIN vn2008.Tipos tp ON tp.tipo_id = v.tipo_id
 				JOIN vn2008.reinos r ON r.id = tp.reino_id
-				JOIN vn2008.Tickets t ON t.Id_Ticket = m.Id_Ticket
+				JOIN vn.ticket t ON t.id = m.Id_Ticket
 			WHERE tm.period BETWEEN periodStart AND periodEnd
-				AND t.Id_Cliente NOT IN(400,200)
-				AND t.warehouse_id NOT IN (0,13)		
-			GROUP BY m.Id_Article, Periodo, t.warehouse_id;
+				AND t.clientFk NOT IN(400,200)
+				AND t.warehouseFk NOT IN (0,13)		
+			GROUP BY m.Id_Article, Periodo, t.warehouseFk;
 END$$
 DELIMITER ;
--- a/db/routines/bs/procedures/comercialesCompleto.sql
+++ b/db/routines/bs/procedures/comercialesCompleto.sql
@ -70,23 +70,23 @@ BEGIN
 				AND (v.fecha BETWEEN TIMESTAMPADD(DAY, - DAY(vDate) + 1, vDate)  AND TIMESTAMPADD(DAY, - 1, vDate))
 		GROUP BY Id_Cliente) mes_actual ON mes_actual.Id_Cliente = c.Id_Cliente
 			LEFT JOIN
-		(SELECT t.Id_Cliente, SUM(m.preu * m.Cantidad * (1 - m.Descuento / 100)) futur
-				FROM vn2008.Tickets t
-					JOIN vn2008.Clientes c ON c.Id_Cliente = t.Id_Cliente
-					JOIN vn2008.Movimientos m ON m.Id_Ticket = t.Id_Ticket
+		(SELECT t.clientFk, SUM(m.preu * m.Cantidad * (1 - m.Descuento / 100)) futur
+				FROM vn.ticket t
+					JOIN vn2008.Clientes c ON c.Id_Cliente = t.clientFk
+					JOIN vn2008.Movimientos m ON m.Id_Ticket = t.id
 					LEFT JOIN vn2008.Trabajadores tr ON c.Id_Trabajador = tr.Id_Trabajador
 				WHERE
 					(c.Id_Trabajador = vWorker OR tr.boss = vWorker)
-					AND t.Fecha BETWEEN vDate AND util.dayEnd(LAST_DAY(vDate))
+					AND t.shipped BETWEEN vDate AND util.dayEnd(LAST_DAY(vDate))
 				GROUP BY Id_Cliente) f ON c.Id_Cliente = f.Id_Cliente
 			LEFT JOIN
-		(SELECT MAX(t.Fecha) LastTicket, c.Id_Cliente
-				FROM vn2008.Tickets t
-						JOIN vn2008.Clientes c ON c.Id_cliente = t.Id_Cliente
+		(SELECT MAX(t.shipped) LastTicket, c.Id_Cliente
+				FROM vn.ticket t
+						JOIN vn2008.Clientes c ON c.Id_cliente = t.clientFk
 						LEFT JOIN vn2008.Trabajadores tr ON c.Id_Trabajador = tr.Id_Trabajador
 					WHERE
 						(c.Id_Trabajador = vWorker OR tr.boss = vWorker)
-					GROUP BY t.Id_Cliente) LastTicket ON LastTicket.Id_Cliente = c.Id_Cliente
+					GROUP BY t.clientFk) LastTicket ON LastTicket.Id_Cliente = c.Id_Cliente
 					LEFT JOIN
 		(
 			SELECT SUM(importe) peso, c.Id_Cliente
--- a/db/routines/bs/procedures/manaCustomerUpdate.sql
+++ b/db/routines/bs/procedures/manaCustomerUpdate.sql
@ -68,13 +68,13 @@ BEGIN
                FROM 
                (
                    SELECT cs.Id_Cliente, Cantidad * Valor as mana
-                        FROM vn2008.Tickets t
+                        FROM vn.ticket t
                            JOIN vn2008.Consignatarios cs using(Id_Consigna)
-                            JOIN vn2008.Movimientos m on m.Id_Ticket = t.Id_Ticket
+                            JOIN vn2008.Movimientos m on m.Id_Ticket = t.id
                            JOIN vn2008.Movimientos_componentes mc on mc.Id_Movimiento = m.Id_Movimiento
                        WHERE Id_Componente IN (vManaAutoId, vManaId, vClaimManaId)
-                            AND t.Fecha > vFromDated 
-                            AND date(t.Fecha) <= vToDated
+                            AND t.shipped > vFromDated 
+                            AND date(t.shipped) <= vToDated
                    UNION ALL
                    SELECT r.Id_Cliente, - Entregado
                        FROM vn2008.Recibos r
--- a/db/routines/bs/procedures/ventas_contables_add.sql
+++ b/db/routines/bs/procedures/ventas_contables_add.sql
@ -19,11 +19,11 @@ BEGIN

 	DROP TEMPORARY TABLE IF EXISTS tmp.ticket_list;
 	CREATE TEMPORARY TABLE tmp.ticket_list
-		(PRIMARY KEY (Id_Ticket))
+		(PRIMARY KEY (id))
 		ENGINE = MEMORY
-		SELECT Id_Ticket
-			FROM vn2008.Tickets t
-				JOIN vn2008.Facturas f ON f.Id_Factura = t.Factura
+		SELECT id
+			FROM vn.ticket t
+				JOIN vn2008.Facturas f ON f.Id_Factura = t.refFk
 			WHERE year(f.Fecha) = vYear
 				AND month(f.Fecha) = vMonth;   

@ -46,7 +46,7 @@ BEGIN
 				  ) as grupo
 			  , tp.reino_id
 			  , a.tipo_id
-			  , t.empresa_id
+			  , t.companyFk
 			  , 7000000000 
 				+ IF(e.empresa_grupo = e2.empresa_grupo
 									  ,1
@ -54,12 +54,12 @@ BEGIN
 									  ) * 1000000  
 				+ tp.reino_id * 10000 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
+				JOIN vn.ticket t on t.id = m.Id_Ticket
+				JOIN vn2008.Consignatarios cs on cs.Id_Consigna = t.addressFk
 				JOIN vn2008.Clientes c on c.Id_Cliente = cs.Id_Cliente
-				JOIN tmp.ticket_list tt on tt.Id_Ticket = t.Id_Ticket
+				JOIN tmp.ticket_list tt on tt.id = t.id
 				JOIN vn2008.Articles a on m.Id_Article = a.Id_Article
-				JOIN vn2008.empresa e on e.id = t.empresa_id
+				JOIN vn2008.empresa e on e.id = t.companyFk
 				LEFT JOIN vn2008.empresa e2 on e2.Id_Cliente = c.Id_Cliente
 				JOIN vn2008.Tipos tp on tp.tipo_id = a.tipo_id
 			WHERE Cantidad <> 0
@ -92,7 +92,7 @@ BEGIN
 				JOIN vn.ticket t ON ts.ticketFk = t.id
 				JOIN vn.address a on a.id = t.addressFk 
 				JOIN vn.client cl on cl.id = a.clientFk 
-				JOIN tmp.ticket_list tt on tt.Id_Ticket = t.id
+				JOIN tmp.ticket_list tt on tt.id = t.id
 				JOIN vn.company c on c.id = t.companyFk 
 				LEFT JOIN vn.company c2 on c2.clientFk = cl.id
 			GROUP BY grupo, t.companyFk ;	
--- a/db/routines/bs/procedures/ventas_contables_por_cliente.sql
+++ b/db/routines/bs/procedures/ventas_contables_por_cliente.sql
@ -10,38 +10,38 @@ BEGIN
 	DROP TEMPORARY TABLE IF EXISTS tmp.ticket_list;

 	CREATE TEMPORARY TABLE tmp.ticket_list
-		(PRIMARY KEY (Id_Ticket))
-		SELECT Id_Ticket
-			FROM vn2008.Tickets t
-				JOIN vn2008.Facturas f ON f.Id_Factura = t.Factura
-			WHERE year(f.Fecha) = vYear
-				AND month(f.Fecha) = vMonth;   		
-	            
+		(PRIMARY KEY (id))
+		SELECT id
+			FROM vn.ticket t
+				JOIN vn2008.Facturas f ON f.Id_Factura = t.refFk
+			WHERE year(f.shipped) = vYear
+				AND month(f.shipped) = vMonth;
+
 	SELECT vYear Año,
 			vMonth Mes,
-			t.Id_Cliente,
+			t.clientFk,
 			round(sum(Cantidad * Preu * (100 - m.Descuento)/100)) Venta,
 			IF(e.empresa_grupo = e2.empresa_grupo,
 				1,
 				IF(e2.empresa_grupo,2,0))
 			AS grupo,
-			t.empresa_id empresa
+			t.companyFk empresa
 		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
+			JOIN vn.ticket t ON t.id = m.Id_Ticket
+			JOIN vn2008.Consignatarios cs ON cs.Id_Consigna = t.addressFk
 			JOIN vn2008.Clientes c ON c.Id_Cliente = cs.Id_Cliente
-			JOIN tmp.ticket_list tt ON tt.Id_Ticket = t.Id_Ticket
+			JOIN tmp.ticket_list tt ON tt.id = t.id
 			JOIN vn2008.Articles a ON m.Id_Article = a.Id_Article
-			JOIN vn2008.empresa e ON e.id = t.empresa_id
+			JOIN vn2008.empresa e ON e.id = t.companyFk
 			LEFT JOIN vn2008.empresa e2 ON e2.Id_Cliente = c.Id_Cliente
 			JOIN vn2008.Tipos tp ON tp.tipo_id = a.tipo_id
 		WHERE Cantidad <> 0
 			AND Preu <> 0
 			AND m.Descuento <> 100
 			AND a.tipo_id != 188
-		GROUP BY t.Id_Cliente, grupo,t.empresa_id;
+		GROUP BY t.clientFk, grupo,t.companyFk;
 	
 	DROP TEMPORARY TABLE tmp.ticket_list;
-			
+
 END$$
 DELIMITER ;
--- a/db/routines/vn/functions/getAlert3StateTest.sql
+++ b/db/routines/vn/functions/getAlert3StateTest.sql
@ -11,9 +11,9 @@ BEGIN
 	SELECT 
 		a.Vista
 	INTO vDeliveryType 
-		FROM vn2008.Tickets t
-			JOIN vn2008.Agencias a ON a.Id_Agencia = t.Id_Agencia
-	WHERE Id_Ticket = vTicket;
+		FROM ticket t
+			JOIN vn2008.Agencias a ON a.Id_Agencia = t.agencyModeFk
+	WHERE id = vTicket;
 		
 		CASE vDeliveryType
 			WHEN 1 THEN -- AGENCIAS
@ -23,11 +23,11 @@ BEGIN
 				SET vCode = 'ON_DELIVERY';
 					
 			ELSE -- MERCADO, OTROS
-				SELECT t.warehouse_id <> w.warehouse_id INTO isWaitingForPickUp
-					FROM vn2008.Tickets t 
+				SELECT t.warehouseFk <> w.warehouse_id INTO isWaitingForPickUp
+					FROM ticket t 
 						LEFT JOIN vn2008.warehouse_pickup w 
-							ON w.agency_id = t.Id_Agencia AND w.warehouse_id = t.warehouse_id
-					WHERE t.Id_Ticket = vTicket;
+							ON w.agency_id = t.agencyModeFk AND w.warehouse_id = t.warehouseFk
+					WHERE t.id = vTicket;
 						
 			IF isWaitingForPickUp THEN
 				SET vCode = 'WAITING_FOR_PICKUP';
--- a/db/routines/vn/functions/isPalletHomogeneus.sql
+++ b/db/routines/vn/functions/isPalletHomogeneus.sql
@ -14,12 +14,12 @@ BEGIN

 		SELECT COUNT(*) INTO vDistinctRoutesInThePallet
 		FROM (
-			SELECT DISTINCT t.Id_Ruta
+			SELECT DISTINCT t.routeFk
 			FROM vn2008.scan_line sl
 				JOIN vn2008.expeditions e ON e.expeditions_id = sl.code
-				JOIN vn2008.Tickets t ON t.Id_Ticket = e.ticket_id
+				JOIN ticket t ON t.id = e.ticket_id
 			WHERE sl.scan_id = vScanId
-				AND t.Id_Ruta
+				AND t.routeFk
 		) t1;
 			
 	RETURN vDistinctRoutesInThePallet = 1;
--- a/db/routines/vn/functions/ticketPositionInPath.sql
+++ b/db/routines/vn/functions/ticketPositionInPath.sql
@ -28,10 +28,10 @@ SELECT t.routeFk, t.warehouseFk, IFNULL(ts.productionOrder,0)

 SELECT (ag.`name` = 'VN_VALENCIA') 
 INTO vIsValenciaPath
-  FROM vn2008.Rutas r
-   JOIN vn2008.Agencias a on a.Id_Agencia = r.Id_Agencia
+  FROM `route` r
+   JOIN vn2008.Agencias a on a.Id_Agencia = r.agencyModeFk
   JOIN vn2008.agency ag on ag.agency_id = a.agency_id
-  WHERE r.Id_Ruta = vMyPath;
+  WHERE r.id = vMyPath;

 IF vIsValenciaPath THEN -- Rutas Valencia

--- a/db/routines/vn/procedures/invoiceFromAddress.sql
+++ b/db/routines/vn/procedures/invoiceFromAddress.sql
@ -10,10 +10,13 @@ BEGIN

 	CREATE TEMPORARY TABLE `tmp.``ticketToInvoice`
 		(PRIMARY KEY  (`id`))
-        ENGINE = MEMORY
-		SELECT Id_Ticket id FROM vn2008.Tickets WHERE (Fecha BETWEEN vMinDateTicket
-			AND vMaxTicketDate) AND Id_Consigna = vAddress
-            AND Factura IS NULL AND empresa_id = vCompany;
+		ENGINE = MEMORY
+		SELECT id id 
+			FROM ticket 
+			WHERE (shipped BETWEEN vMinDateTicket AND vMaxTicketDate) 
+				AND addressFk = vAddress
+				AND refFk IS NULL 
+				AND companyFk = vCompany;

 END$$
 DELIMITER ;
--- a/db/routines/vn2008/procedures/availableTraslate.sql
+++ b/db/routines/vn2008/procedures/availableTraslate.sql
@ -18,7 +18,7 @@ proc: BEGIN
 	-- Calcula algunos parámetros necesarios
 	SET vDatedFrom = TIMESTAMP(vDated, '00:00:00');
 	SET vDatedTo = TIMESTAMP(TIMESTAMPADD(DAY, 4, vDated), '23:59:59');
-	SELECT FechaInventario INTO vDatedInventory FROM tblContadores;
+	SELECT inventoried INTO vDatedInventory FROM vn.config;
 	SELECT SUBTIME(util.VN_NOW(), reserveTime) INTO vDatedReserve
 		FROM hedera.orderConfig;

--- a/db/routines/vn2008/procedures/clean.sql
+++ b/db/routines/vn2008/procedures/clean.sql
@ -34,8 +34,8 @@ proc: BEGIN
 		WHERE t.Fecha < vDate;

 	DELETE tobs
-		FROM ticket_observation tobs
-	JOIN Tickets t ON tobs.Id_Ticket = t.Id_Ticket
+		FROM ticketObservation tobs
+	JOIN Tickets t ON tobs.ticketFk = t.Id_Ticket
 		WHERE t.Fecha < vDate;

 	DELETE tobs
@ -45,10 +45,10 @@ proc: BEGIN

 	DELETE FROM Remesas WHERE `Fecha Remesa` < vDate18;

-	DELETE tt.*
-		FROM Tickets_turno tt
-			LEFT JOIN Movimientos m USING(Id_Ticket)
-		WHERE m.Id_Article IS NULL;
+	DELETE tw.*
+		FROM vn.ticketWeekly tw
+			LEFT JOIN vn.sale s USING(ticketFk)
+		WHERE s.Id_Article IS NULL;

 	DELETE FROM cl_main WHERE Fecha < vDate18;
 	DELETE FROM hedera.`order` WHERE date_send < vDate18;
--- a/db/routines/vn2008/procedures/confection_control_source.sql
+++ b/db/routines/vn2008/procedures/confection_control_source.sql
@ -11,33 +11,33 @@ BEGIN
 	CREATE TEMPORARY TABLE tmp.production_buffer
 	ENGINE = MEMORY
 		SELECT 
-			date(t.Fecha) as Fecha,
-			hour(t.Fecha) as Hora,
-			hour(t.Fecha) as Departure,
-			t.Id_Ticket,
+			date(t.shipped) as Fecha,
+			hour(t.shipped) as Hora,
+			hour(t.shipped) as Departure,
+			t.id,
            m.Id_Movimiento,
 			m.Cantidad,
 			m.Concepte,
            ABS(m.Reservado) Reservado,
 			i.Categoria,
            tp.Tipo,
-			t.Alias as Cliente,
+			t.nickname as Cliente,
 			wh.name as Almacen,
-			t.warehouse_id,
+			t.warehouseFk,
 			cs.province_id,
 			a.agency_id,
            ct.description as Taller,
            stock.visible,
            stock.available
-		FROM vn2008.Tickets t
-			JOIN vn2008.Agencias a ON a.Id_Agencia = t.Id_Agencia
-			JOIN vn.warehouse wh ON wh.id = t.warehouse_id
-			JOIN vn2008.Movimientos m ON m.Id_Ticket = t.Id_Ticket
+		FROM vn.ticket t
+			JOIN vn2008.Agencias a ON a.Id_Agencia = t.agencyModeFk
+			JOIN vn.warehouse wh ON wh.id = t.warehouseFk
+			JOIN vn2008.Movimientos m ON m.Id_Ticket = t.id
            JOIN vn2008.Articles i ON i.Id_Article = m.Id_Article
 			JOIN vn2008.Tipos tp ON tp.tipo_id = i.tipo_id
            JOIN vn.confectionType ct ON ct.id = tp.confeccion
-			JOIN vn2008.Consignatarios cs on cs.Id_Consigna = t.Id_Consigna
-			LEFT JOIN vn.ticketState tls on tls.ticketFk = t.Id_Ticket
+			JOIN vn2008.Consignatarios cs on cs.Id_Consigna = t.addressFk
+			LEFT JOIN vn.ticketState tls on tls.ticketFk = t.id
            LEFT JOIN 
 				(					
 					SELECT item_id, sum(visible) visible, sum(available) available
@ -61,7 +61,7 @@ BEGIN
 		WHERE tp.confeccion 
 			AND tls.alertLevel < maxAlertLevel
 			AND wh.hasConfectionTeam
-			AND t.Fecha BETWEEN vDated AND vEndingDate
+			AND t.shipped BETWEEN vDated AND vEndingDate
            AND m.Cantidad > 0;

 	-- Entradas
--- a/db/routines/vn2008/procedures/historico_multiple.sql
+++ b/db/routines/vn2008/procedures/historico_multiple.sql
@ -4,7 +4,7 @@ BEGIN

 	DECLARE vDateInventory DATETIME;

-	SELECT Fechainventario INTO vDateInventory FROM tblContadores;
+	SELECT inventoried INTO vDateInventory FROM vn.config;

 	SET @a = 0;

--- a/db/routines/vn2008/views/Tickets_state.sql
+++ b/db/routines/vn2008/views/Tickets_state.sql
@ -1,7 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`Tickets_state`
-AS SELECT `t`.`ticketFk` AS `Id_Ticket`,
-	`t`.`ticketTrackingFk` AS `inter_id`,
-	`t`.`name` AS `state_name`
-FROM `vn`.`ticketLastState` `t`
--- a/db/routines/vn2008/views/Tickets_turno.sql
+++ b/db/routines/vn2008/views/Tickets_turno.sql
@ -1,6 +0,0 @@
-CREATE OR REPLACE DEFINER=`root`@`localhost`
-	SQL SECURITY DEFINER
-	VIEW `vn2008`.`Tickets_turno`
-AS SELECT `tw`.`ticketFk` AS `Id_Ticket`,
-	`tw`.`weekDay` AS `weekDay`
-FROM `vn`.`ticketWeekly` `tw`